From 92cb164856fc21bd0d6d5351a4106985c79e8fd7 Mon Sep 17 00:00:00 2001
From: Pontus Melke <pontusmelke@gmail.com>
Date: Wed, 2 Aug 2017 17:00:53 +0200
Subject: [PATCH] Refactor bolt module

- Remove unused stuff
- Make packing/unpacking symmetric in types
---
 .../bolt/v1/messaging/BoltMessageRouter.java  |   3 +-
 .../messaging/BoltRequestMessageReader.java   |   4 +-
 .../messaging/BoltResponseMessageHandler.java |   5 +-
 .../messaging/BoltResponseMessageWriter.java  |   4 +-
 .../messaging/MessageProcessingHandler.java   |  11 +-
 .../neo4j/bolt/v1/messaging/Neo4jPack.java    | 104 ++--
 .../org/neo4j/bolt/v1/messaging/PathPack.java | 228 --------
 .../infrastructure/UnboundRelationship.java   |  34 --
 .../messaging/infrastructure/ValueNode.java   | 335 -----------
 .../messaging/infrastructure/ValuePath.java   | 297 ----------
 .../ValuePropertyContainer.java               |  68 ---
 .../infrastructure/ValueRelationship.java     | 234 --------
 .../ValueUnboundRelationship.java             | 223 -------
 .../bolt/v1/runtime/BoltResponseHandler.java  |   3 +-
 .../bolt/v1/runtime/BoltStateMachine.java     |  66 ++-
 .../bolt/v1/runtime/CypherAdapterStream.java  |  71 ++-
 .../v1/runtime/ExecutionPlanConverter.java    |  37 +-
 .../neo4j/bolt/v1/runtime/spi/BoltResult.java |   3 +-
 .../bolt/v1/runtime/spi/BookmarkResult.java   |   4 +-
 .../org/neo4j/bolt/testing/BoltMatchers.java  |   6 +-
 .../bolt/testing/BoltResponseRecorder.java    |  11 +-
 .../bolt/testing/NullResponseHandler.java     |   3 +-
 .../bolt/testing/RecordedBoltResponse.java    |   5 +-
 .../v1/messaging/BoltRequestMessageTest.java  |  37 +-
 .../messaging/BoltRequestMessageWriter.java   |   9 +-
 .../messaging/BoltResponseMessageReader.java  |  14 +-
 .../BoltResponseMessageRecorder.java          |   5 +-
 .../v1/messaging/BoltResponseMessageTest.java |  37 +-
 .../MessageProcessingHandlerTest.java         |   4 +-
 .../bolt/v1/messaging/Neo4jPackTest.java      | 108 ++--
 .../bolt/v1/messaging/example/Edges.java      |  57 ++
 .../bolt/v1/messaging/example/Nodes.java      |  43 +-
 .../bolt/v1/messaging/example/Paths.java      |  80 ++-
 .../v1/messaging/example/Relationships.java   |  64 --
 .../bolt/v1/messaging/example/Support.java    |  68 +--
 .../infrastructure/ValuePathTest.java         | 166 ------
 .../v1/messaging/message/SuccessMessage.java  |   9 +-
 .../v1/messaging/util/MessageMatchers.java    |  61 +-
 .../v1/runtime/CypherAdapterStreamTest.java   | 199 ++++---
 .../runtime/ExecutionPlanConverterTest.java   |  28 +-
 .../neo4j/bolt/v1/runtime/ResetFuzzTest.java  |   3 +-
 .../integration/BoltConnectionAuthIT.java     |  14 +-
 .../runtime/integration/BoltConnectionIT.java |   3 +-
 .../bolt/v1/runtime/spi/StreamMatchers.java   |   3 +-
 .../javacompat/ValueToObjectSerializer.java   | 508 +---------------
 .../compatibility/v2_3/Compatibility.scala    |   2 +-
 .../runtime/commands/expressions/Add.scala    |   8 +-
 .../expressions/DesugaredMapProjection.scala  |   4 +-
 .../main/java/org/neo4j/values/AnyValues.java |  43 --
 .../neo4j/values/BaseToObjectValueWriter.java | 545 ++++++++++++++++++
 .../org/neo4j/values/storable/TextArray.java  |   2 +-
 .../neo4j/values/virtual/ArrayHelpers.java    |  16 +-
 .../org/neo4j/values/virtual/ListValue.java   |  83 ++-
 .../org/neo4j/values/virtual/MapValue.java    |   6 +
 .../neo4j/values/virtual/VirtualValues.java   |  49 ++
 55 files changed, 1350 insertions(+), 2687 deletions(-)
 delete mode 100644 community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/PathPack.java
 delete mode 100644 community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/infrastructure/UnboundRelationship.java
 delete mode 100644 community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/infrastructure/ValueNode.java
 delete mode 100644 community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/infrastructure/ValuePath.java
 delete mode 100644 community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/infrastructure/ValuePropertyContainer.java
 delete mode 100644 community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/infrastructure/ValueRelationship.java
 delete mode 100644 community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/infrastructure/ValueUnboundRelationship.java
 create mode 100644 community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/example/Edges.java
 delete mode 100644 community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/example/Relationships.java
 delete mode 100644 community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/infrastructure/ValuePathTest.java
 create mode 100644 community/values/src/main/java/org/neo4j/values/BaseToObjectValueWriter.java

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltMessageRouter.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltMessageRouter.java
index 3e56073c9fe31..e58bb32097356 100644
--- a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltMessageRouter.java
+++ b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltMessageRouter.java
@@ -26,6 +26,7 @@
 import org.neo4j.bolt.v1.runtime.Neo4jError;
 import org.neo4j.bolt.v1.runtime.spi.BoltResult;
 import org.neo4j.logging.Log;
+import org.neo4j.values.AnyValue;
 import org.neo4j.values.result.QueryResult;
 
 /**
@@ -139,7 +140,7 @@ public void visit( QueryResult.Record record ) throws Exception
                 }
 
                 @Override
-                public void addMetadata( String key, Object value )
+                public void addMetadata( String key, AnyValue value )
                 {
                     metadata.put( key, value );
                 }
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltRequestMessageReader.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltRequestMessageReader.java
index eeb5e9b2bc214..3dc7fe7b550d3 100644
--- a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltRequestMessageReader.java
+++ b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltRequestMessageReader.java
@@ -63,7 +63,7 @@ public <E extends Exception> void read( BoltRequestMessageHandler<E> handler ) t
                 {
                 case INIT:
                     String clientName = unpacker.unpackString();
-                    Map<String,Object> credentials = unpacker.unpackMap();
+                    Map<String,Object> credentials = unpacker.unpackToRawMap();
                     handler.onInit( clientName, credentials );
                     break;
                 case ACK_FAILURE:
@@ -74,7 +74,7 @@ public <E extends Exception> void read( BoltRequestMessageHandler<E> handler ) t
                     break;
                 case RUN:
                     String statement = unpacker.unpackString();
-                    Map<String,Object> params = unpacker.unpackMap();
+                    Map<String,Object> params = unpacker.unpackToRawMap();
                     Optional<Neo4jError> error = unpacker.consumeError();
                     if ( error.isPresent() )
                     {
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltResponseMessageHandler.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltResponseMessageHandler.java
index a91a7a14360ba..a7ee5b9d21480 100644
--- a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltResponseMessageHandler.java
+++ b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltResponseMessageHandler.java
@@ -19,10 +19,9 @@
  */
 package org.neo4j.bolt.v1.messaging;
 
-import java.util.Map;
-
 import org.neo4j.kernel.api.exceptions.Status;
 import org.neo4j.values.result.QueryResult;
+import org.neo4j.values.virtual.MapValue;
 
 /**
  * Interface defining simple handler methods for each defined
@@ -32,7 +31,7 @@
  */
 public interface BoltResponseMessageHandler<E extends Exception>
 {
-    void onSuccess( Map<String, Object> metadata ) throws E;
+    void onSuccess( MapValue metadata ) throws E;
 
     void onRecord( QueryResult.Record item ) throws E;
 
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltResponseMessageWriter.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltResponseMessageWriter.java
index d82bf4b9ef279..36a80c19b9903 100644
--- a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltResponseMessageWriter.java
+++ b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltResponseMessageWriter.java
@@ -20,11 +20,11 @@
 package org.neo4j.bolt.v1.messaging;
 
 import java.io.IOException;
-import java.util.Map;
 
 import org.neo4j.kernel.api.exceptions.Status;
 import org.neo4j.values.AnyValue;
 import org.neo4j.values.result.QueryResult;
+import org.neo4j.values.virtual.MapValue;
 
 import static org.neo4j.bolt.v1.messaging.BoltResponseMessage.FAILURE;
 import static org.neo4j.bolt.v1.messaging.BoltResponseMessage.IGNORED;
@@ -72,7 +72,7 @@ public void onRecord( QueryResult.Record item ) throws IOException
     }
 
     @Override
-    public void onSuccess( Map<String, Object> metadata ) throws IOException
+    public void onSuccess( MapValue metadata ) throws IOException
     {
         packer.packStructHeader( 1, SUCCESS.signature() );
         packer.packRawMap( metadata );
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/MessageProcessingHandler.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/MessageProcessingHandler.java
index 909c8fa30c89f..a0550c432d54e 100644
--- a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/MessageProcessingHandler.java
+++ b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/MessageProcessingHandler.java
@@ -29,10 +29,13 @@
 import org.neo4j.bolt.v1.runtime.Neo4jError;
 import org.neo4j.bolt.v1.runtime.spi.BoltResult;
 import org.neo4j.logging.Log;
+import org.neo4j.values.AnyValue;
+import org.neo4j.values.virtual.MapValue;
+import org.neo4j.values.virtual.VirtualValues;
 
 class MessageProcessingHandler implements BoltResponseHandler
 {
-    protected final Map<String,Object> metadata = new HashMap<>();
+    protected final Map<String,AnyValue> metadata = new HashMap<>();
 
     protected final Log log;
     protected final BoltWorker worker;
@@ -62,7 +65,7 @@ public void onRecords( BoltResult result, boolean pull ) throws Exception
     }
 
     @Override
-    public void onMetadata( String key, Object value )
+    public void onMetadata( String key, AnyValue value )
     {
         metadata.put( key, value );
     }
@@ -109,9 +112,9 @@ else if ( error != null )
         }
     }
 
-    Map<String,Object> getMetadata()
+    MapValue getMetadata()
     {
-        return metadata;
+        return VirtualValues.map( metadata );
     }
 
     private void clearState()
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/Neo4jPack.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/Neo4jPack.java
index e2717f30b688d..67f5b23bdfc27 100644
--- a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/Neo4jPack.java
+++ b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/Neo4jPack.java
@@ -32,18 +32,25 @@
 import org.neo4j.bolt.v1.packstream.PackType;
 import org.neo4j.bolt.v1.runtime.Neo4jError;
 import org.neo4j.collection.primitive.PrimitiveLongIntKeyValueArray;
+import org.neo4j.graphdb.Node;
+import org.neo4j.graphdb.Relationship;
+import org.neo4j.graphdb.spatial.Point;
 import org.neo4j.kernel.api.exceptions.Status;
 import org.neo4j.values.AnyValue;
 import org.neo4j.values.AnyValueWriter;
-import org.neo4j.values.AnyValues;
+import org.neo4j.values.BaseToObjectValueWriter;
 import org.neo4j.values.storable.TextArray;
 import org.neo4j.values.storable.TextValue;
+import org.neo4j.values.storable.Values;
 import org.neo4j.values.virtual.CoordinateReferenceSystem;
 import org.neo4j.values.virtual.EdgeValue;
+import org.neo4j.values.virtual.ListValue;
 import org.neo4j.values.virtual.MapValue;
 import org.neo4j.values.virtual.NodeValue;
+import org.neo4j.values.virtual.VirtualValues;
 
 import static org.neo4j.bolt.v1.packstream.PackStream.UNKNOWN_SIZE;
+import static org.neo4j.values.storable.Values.byteArray;
 
 /**
  * Extended PackStream packer and unpacker classes for working
@@ -52,7 +59,7 @@
 public class Neo4jPack
 {
     private static final List<Object> EMPTY_LIST = new ArrayList<>();
-    private static final Map<String,Object> EMPTY_MAP = new HashMap<>();
+    private static final Map<String,AnyValue> EMPTY_MAP = new HashMap<>();
 
     public static final byte NODE = 'N';
     public static final byte RELATIONSHIP = 'R';
@@ -79,26 +86,10 @@ public void pack( AnyValue value ) throws IOException
             value.writeTo( this );
         }
 
-        //TODO this should go away when we have cypher providing us with values
-        public void pack( Object value ) throws IOException
-        {
-            try
-            {
-                pack( AnyValues.of( value ) );
-            }
-            catch ( IllegalArgumentException e )
-            {
-                error = new Error( Status.Request.Invalid,
-                        "Unpackable value " + value + " of type " + value.getClass().getName() );
-                packNull();
-            }
-        }
-
-        //TODO this needs to go away as well since it is relying on pack(Object)
-        public void packRawMap( Map<String,Object> map ) throws IOException
+        public void packRawMap( MapValue map ) throws IOException
         {
             packMapHeader( map.size() );
-            for ( Map.Entry<String,Object> entry : map.entrySet() )
+            for ( Map.Entry<String,AnyValue> entry : map.entrySet() )
             {
                 pack( entry.getKey() );
                 pack( entry.getValue() );
@@ -440,25 +431,25 @@ public Unpacker( PackInput input )
             super( input );
         }
 
-        public Object unpack() throws IOException
+        public AnyValue unpack() throws IOException
         {
             PackType valType = peekNextType();
             switch ( valType )
             {
             case BYTES:
-                return unpackBytes();
+                return byteArray( unpackBytes() );
             case STRING:
-                return unpackString();
+                return Values.stringValue( unpackString() );
             case INTEGER:
-                return unpackLong();
+                return Values.longValue( unpackLong() );
             case FLOAT:
-                return unpackDouble();
+                return Values.doubleValue( unpackDouble() );
             case BOOLEAN:
-                return unpackBoolean();
+                return Values.booleanValue( unpackBoolean() );
             case NULL:
                 // still need to move past the null value
                 unpackNull();
-                return null;
+                return Values.NO_VALUE;
             case LIST:
             {
                 return unpackList();
@@ -505,14 +496,14 @@ public Object unpack() throws IOException
             }
         }
 
-        List<Object> unpackList() throws IOException
+        ListValue unpackList() throws IOException
         {
             int size = (int) unpackListHeader();
             if ( size == 0 )
             {
-                return EMPTY_LIST;
+                return VirtualValues.EMPTY_LIST;
             }
-            ArrayList<Object> list;
+            ArrayList<AnyValue> list;
             if ( size == UNKNOWN_SIZE )
             {
                 list = new ArrayList<>();
@@ -539,17 +530,17 @@ List<Object> unpackList() throws IOException
                     list.add( unpack() );
                 }
             }
-            return list;
+            return VirtualValues.list( list.toArray( new AnyValue[list.size()] ) );
         }
 
-        public Map<String,Object> unpackMap() throws IOException
+        public MapValue unpackMap() throws IOException
         {
             int size = (int) unpackMapHeader();
             if ( size == 0 )
             {
-                return EMPTY_MAP;
+                return VirtualValues.EMPTY_MAP;
             }
-            Map<String,Object> map;
+            Map<String,AnyValue> map;
             if ( size == UNKNOWN_SIZE )
             {
                 map = new HashMap<>();
@@ -558,7 +549,7 @@ public Map<String,Object> unpackMap() throws IOException
                 {
                     PackType keyType = peekNextType();
                     String key;
-                    Object val;
+                    AnyValue val;
                     switch ( keyType )
                     {
                     case END_OF_STREAM:
@@ -608,13 +599,26 @@ public Map<String,Object> unpackMap() throws IOException
                         throw new PackStream.PackStreamException( "Bad key type: " + type );
                     }
 
-                    Object val = unpack();
+                    AnyValue val = unpack();
                     if ( map.put( key, val ) != null )
                     {
                         errors.add( Neo4jError.from( Status.Request.Invalid, "Duplicate map key `" + key + "`." ) );
                     }
                 }
             }
+            return VirtualValues.map( map );
+        }
+
+        public Map<String,Object> unpackToRawMap() throws IOException
+        {
+            MapValue mapValue = unpackMap();
+            HashMap<String,Object> map = new HashMap<>( mapValue.size() );
+            for ( Map.Entry<String,AnyValue> entry : mapValue.entrySet() )
+            {
+                UnpackerWriter unpackerWriter = new UnpackerWriter();
+                entry.getValue().writeTo( unpackerWriter );
+                map.put( entry.getKey(), unpackerWriter.value() );
+            }
             return map;
         }
 
@@ -658,4 +662,32 @@ String msg()
     private Neo4jPack()
     {
     }
+
+    private static class UnpackerWriter extends BaseToObjectValueWriter<RuntimeException>
+    {
+
+        @Override
+        protected Node newNodeProxyById( long id )
+        {
+            throw new UnsupportedOperationException( "Cannot unpack nodes" );
+        }
+
+        @Override
+        protected Relationship newRelationshipProxyById( long id )
+        {
+            throw new UnsupportedOperationException( "Cannot unpack relationships" );
+        }
+
+        @Override
+        protected Point newGeographicPoint( double longitude, double latitude, String name, int code, String href )
+        {
+            throw new UnsupportedOperationException( "Cannot unpack points" );
+        }
+
+        @Override
+        protected Point newCartesianPoint( double x, double y, String name, int code, String href )
+        {
+            throw new UnsupportedOperationException( "Cannot unpack points" );
+        }
+    }
 }
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/PathPack.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/PathPack.java
deleted file mode 100644
index d325ff759a769..0000000000000
--- a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/PathPack.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * Copyright (c) 2002-2017 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
- *
- * This file is part of Neo4j.
- *
- * Neo4j is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.neo4j.bolt.v1.messaging;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.neo4j.bolt.v1.messaging.infrastructure.ValueNode;
-import org.neo4j.bolt.v1.messaging.infrastructure.ValuePath;
-import org.neo4j.collection.primitive.PrimitiveLongIntKeyValueArray;
-import org.neo4j.graphdb.Node;
-import org.neo4j.graphdb.Path;
-import org.neo4j.graphdb.PropertyContainer;
-import org.neo4j.graphdb.Relationship;
-import org.neo4j.bolt.v1.messaging.infrastructure.ValueUnboundRelationship;
-
-public class PathPack
-{
-    private static final int STRUCT_FIELD_COUNT = 5;
-    private static final int NO_SUCH_ID = -1;
-
-    public static class Packer
-    {
-        private static final int INITIAL_PATH_CAPACITY = 500;
-
-        private final PrimitiveLongIntKeyValueArray nodes =
-                new PrimitiveLongIntKeyValueArray( INITIAL_PATH_CAPACITY + 1 );
-        private final PrimitiveLongIntKeyValueArray relationships =
-                new PrimitiveLongIntKeyValueArray( INITIAL_PATH_CAPACITY );
-
-        private void packNodes( Neo4jPack.Packer packer, Path path )
-                throws IOException
-        {
-            nodes.reset( path.length() + 1 );
-            for ( Node node : path.nodes() )
-            {
-                nodes.putIfAbsent( node.getId(), nodes.size() );
-            }
-            int size = nodes.size();
-            packer.packListHeader( size );
-            if ( size > 0 )
-            {
-                Iterator<Node> iterator = path.nodes().iterator();
-                Node node = iterator.next();
-                for ( long id : nodes.keys() )
-                {
-                    while ( node.getId() != id )
-                    {
-                        node = iterator.next();
-                    }
-                    ValueNode.pack( packer, node );
-                    if ( iterator.hasNext() )
-                    {
-                        node = iterator.next();
-                    }
-                }
-            }
-        }
-
-        private void packRelationships( Neo4jPack.Packer packer, Path path )
-                throws IOException
-        {
-            relationships.reset( path.length() );
-            for ( Relationship rel : path.relationships() )
-            {
-                // relationship indexes are one-based
-                relationships.putIfAbsent( rel.getId(), relationships.size() + 1 );
-            }
-            int size = relationships.size();
-            packer.packListHeader( size );
-            if ( size > 0 )
-            {
-                Iterator<Relationship> iterator = path.relationships().iterator();
-                Relationship rel = iterator.next();
-                for ( long id : relationships.keys() )
-                {
-                    while ( rel.getId() != id )
-                    {
-                        rel = iterator.next();
-                    }
-                    ValueUnboundRelationship.pack( packer, ValueUnboundRelationship.unbind( rel ) );
-                    if ( iterator.hasNext() )
-                    {
-                        rel = iterator.next();
-                    }
-                }
-            }
-        }
-
-        public void pack( Neo4jPack.Packer packer, Path path ) throws IOException
-        {
-            packer.packStructHeader( 3, Neo4jPack.PATH );
-
-            packNodes( packer, path );
-            packRelationships( packer, path );
-
-            Node node = null;
-            packer.packListHeader( 2 * path.length() );
-            int i = 0;
-            for ( PropertyContainer entity : path )
-            {
-                if ( i % 2 == 0 )
-                {
-                    node = (Node) entity;
-                    if ( i > 0 )
-                    {
-                        int index = nodes.getOrDefault( node.getId(), NO_SUCH_ID );
-                        packer.pack( index );
-                    }
-                }
-                else
-                {
-                    Relationship relationship = (Relationship) entity;
-                    int index = relationships.getOrDefault( relationship.getId(), NO_SUCH_ID );
-                    if ( node != null && node.getId() == relationship.getStartNode().getId() )
-                    {
-                        packer.pack( index );
-                    }
-                    else
-                    {
-                        packer.pack( -index );
-                    }
-                }
-                i += 1;
-            }
-        }
-
-    }
-
-    public static class Unpacker
-    {
-
-        public ValuePath unpack( Neo4jPack.Unpacker unpacker )
-                throws IOException
-        {
-            assert unpacker.unpackStructHeader() == STRUCT_FIELD_COUNT;
-            assert unpacker.unpackStructSignature() == Neo4jPack.PATH;
-            return unpackFields( unpacker );
-        }
-
-        public ValuePath unpackFields( Neo4jPack.Unpacker unpacker ) throws IOException
-        {
-            List<Node> nodes = unpackNodes( unpacker );
-            List<Relationship> relationships = unpackRelationships( unpacker );
-            List<Integer> sequence = unpackSequence( unpacker );
-            return new ValuePath( nodes, relationships, sequence );
-        }
-
-        private List<Node> unpackNodes( Neo4jPack.Unpacker unpacker )
-                throws IOException
-        {
-            int count = (int) unpacker.unpackListHeader();
-            if ( count > 0 )
-            {
-                List<Node> items = new ArrayList<>( count );
-                for ( int i = 0; i < count; i++ )
-                {
-                    items.add( ValueNode.unpack( unpacker ) );
-                }
-                return items;
-            }
-            else
-            {
-                return Collections.emptyList();
-            }
-        }
-
-        private List<Relationship> unpackRelationships( Neo4jPack.Unpacker unpacker )
-                throws IOException
-        {
-            int count = (int) unpacker.unpackListHeader();
-            if ( count > 0 )
-            {
-                List<Relationship> items = new ArrayList<>( count );
-                for ( int i = 0; i < count; i++ )
-                {
-                    items.add( ValueUnboundRelationship.unpack( unpacker ) );
-                }
-                return items;
-            }
-            else
-            {
-                return Collections.emptyList();
-            }
-        }
-
-        private List<Integer> unpackSequence( Neo4jPack.Unpacker unpacker )
-                throws IOException
-        {
-            int count = (int) unpacker.unpackListHeader();
-            if ( count > 0 )
-            {
-                List<Integer> items = new ArrayList<>( count );
-                for ( int i = 0; i < count; i++ )
-                {
-                    items.add( unpacker.unpackInteger() );
-                }
-                return items;
-            }
-            else
-            {
-                return Collections.emptyList();
-            }
-        }
-
-    }
-
-}
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/infrastructure/UnboundRelationship.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/infrastructure/UnboundRelationship.java
deleted file mode 100644
index 1babe062939b3..0000000000000
--- a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/infrastructure/UnboundRelationship.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2002-2017 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
- *
- * This file is part of Neo4j.
- *
- * Neo4j is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.neo4j.bolt.v1.messaging.infrastructure;
-
-import org.neo4j.graphdb.Node;
-import org.neo4j.graphdb.Relationship;
-
-public interface UnboundRelationship extends Relationship
-{
-
-    /**
-     * Bind this relationship to a pair of nodes to create a full relationship.
-     *
-     */
-    Relationship bind( Node startNode, Node endNode );
-
-}
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/infrastructure/ValueNode.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/infrastructure/ValueNode.java
deleted file mode 100644
index 8cd6c0ab8bbb3..0000000000000
--- a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/infrastructure/ValueNode.java
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
- * Copyright (c) 2002-2017 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
- *
- * This file is part of Neo4j.
- *
- * Neo4j is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.neo4j.bolt.v1.messaging.infrastructure;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import org.neo4j.bolt.v1.messaging.BoltIOException;
-import org.neo4j.bolt.v1.messaging.Neo4jPack;
-import org.neo4j.graphdb.Direction;
-import org.neo4j.graphdb.GraphDatabaseService;
-import org.neo4j.graphdb.Label;
-import org.neo4j.graphdb.Node;
-import org.neo4j.graphdb.NotFoundException;
-import org.neo4j.graphdb.Relationship;
-import org.neo4j.graphdb.RelationshipType;
-import org.neo4j.helpers.collection.Iterables;
-import org.neo4j.kernel.api.exceptions.Status;
-
-public class ValueNode
-        extends ValuePropertyContainer
-        implements Node
-{
-    private static final int STRUCT_FIELD_COUNT = 3;
-
-    public static void pack( Neo4jPack.Packer packer, Node node )
-            throws IOException
-    {
-        //TODO: We should mark deleted nodes properly but that requires updates to protocol and
-        //clients. Until that we merely don't fail and return a node with neither labels nor properties
-        packer.packStructHeader( STRUCT_FIELD_COUNT, Neo4jPack.NODE );
-        packer.pack( node.getId() );
-        try
-        {
-            //read labels and properties, will fail if node has been deleted
-            Collection<Label> collectedLabels = Iterables.asList( node.getLabels() );
-            Map<String, Object> props = node.getAllProperties();
-
-            packer.packListHeader( collectedLabels.size() );
-            for ( Label label : collectedLabels )
-            {
-                packer.pack( label.name() );
-            }
-            packer.packRawMap( props );
-        }
-        catch ( NotFoundException e )
-        {
-            //node is deleted, just send along an empty node
-            packer.packListHeader( 0 );
-            packer.packRawMap( Collections.emptyMap() );
-        }
-    }
-
-    public static ValueNode unpack( Neo4jPack.Unpacker unpacker )
-            throws IOException
-    {
-        long numFields = unpacker.unpackStructHeader();
-        char signature = unpacker.unpackStructSignature();
-        if ( signature != Neo4jPack.NODE )
-        {
-            throw new BoltIOException( Status.Request.InvalidFormat,
-                    "Expected a node structure, received 0x" + Integer.toHexString( signature ) );
-        }
-        if ( numFields != STRUCT_FIELD_COUNT )
-        {
-            throw new BoltIOException( Status.Request.InvalidFormat,
-                    "Node structures should have " + STRUCT_FIELD_COUNT + " fields, structure sent contained " +
-                            numFields );
-        }
-        return unpackFields( unpacker );
-    }
-
-    public static ValueNode unpackFields( Neo4jPack.Unpacker unpacker )
-            throws IOException
-    {
-        long id = unpacker.unpackLong();
-
-        int numLabels = (int) unpacker.unpackListHeader();
-        List<Label> labels;
-        if ( numLabels > 0 )
-        {
-            labels = new ArrayList<>( numLabels );
-            for ( int i = 0; i < numLabels; i++ )
-            {
-                labels.add( Label.label( unpacker.unpackString() ) );
-            }
-        }
-        else
-        {
-            labels = Collections.emptyList();
-        }
-
-        Map<String, Object> props = unpacker.unpackMap();
-
-        return new ValueNode( id, labels, props );
-    }
-
-    private final long id;
-    private final Collection<Label> labels;
-
-    public ValueNode( long id, Collection<Label> labels, Map<String,Object> props )
-    {
-        super( props );
-
-        this.id = id;
-        this.labels = labels;
-    }
-
-    @Override
-    public long getId()
-    {
-        return id;
-    }
-
-    @Override
-    public Iterable<Label> getLabels()
-    {
-        return labels;
-    }
-
-    @Override
-    public void delete()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Iterable<Relationship> getRelationships()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean hasRelationship()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Iterable<Relationship> getRelationships( RelationshipType... relationshipTypes )
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Iterable<Relationship> getRelationships( Direction direction, RelationshipType... relationshipTypes )
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean hasRelationship( RelationshipType... relationshipTypes )
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean hasRelationship( Direction direction, RelationshipType... relationshipTypes )
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Iterable<Relationship> getRelationships( Direction direction )
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean hasRelationship( Direction direction )
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Iterable<Relationship> getRelationships( RelationshipType relationshipType, Direction direction )
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean hasRelationship( RelationshipType relationshipType, Direction direction )
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Relationship getSingleRelationship( RelationshipType relationshipType, Direction direction )
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Relationship createRelationshipTo( Node node, RelationshipType relationshipType )
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Iterable<RelationshipType> getRelationshipTypes()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public int getDegree()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public int getDegree( RelationshipType relationshipType )
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public int getDegree( Direction direction )
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public int getDegree( RelationshipType relationshipType, Direction direction )
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void addLabel( Label label )
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void removeLabel( Label label )
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean hasLabel( Label label )
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public GraphDatabaseService getGraphDatabase()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean hasProperty( String s )
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Object getProperty( String s, Object o )
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void setProperty( String s, Object o )
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Object removeProperty( String s )
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean equals( Object o )
-    {
-        if ( this == o )
-        {
-            return true;
-        }
-        if ( o == null || getClass() != o.getClass() )
-        {
-            return false;
-        }
-
-        ValueNode valueNode = (ValueNode) o;
-
-        return id == valueNode.id && labels.equals( valueNode.labels );
-
-    }
-
-    @Override
-    public int hashCode()
-    {
-        int result = (int) (id ^ (id >>> 32));
-        result = 31 * result + labels.hashCode();
-        result = 31 * result + getAllProperties().hashCode();
-        return result;
-    }
-
-    @Override
-    public String toString()
-    {
-        return "ValueNode{" +
-               "id=" + id +
-               ", labels=" + labels +
-                ", props=" + getAllProperties() +
-               '}';
-    }
-
-}
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/infrastructure/ValuePath.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/infrastructure/ValuePath.java
deleted file mode 100644
index 09a0cd752d9d6..0000000000000
--- a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/infrastructure/ValuePath.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * Copyright (c) 2002-2017 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
- *
- * This file is part of Neo4j.
- *
- * Neo4j is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.neo4j.bolt.v1.messaging.infrastructure;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.neo4j.graphdb.Node;
-import org.neo4j.graphdb.Path;
-import org.neo4j.graphdb.PropertyContainer;
-import org.neo4j.graphdb.Relationship;
-
-/**
- * A ValuePath is an implementation of the Path interface that is used to
- * represent a walk through a graph within the context of remoting. It is
- * particularly important to ensure a compact (though obviously lossless)
- * on-wire representation of a Path as a naive implementation may contain
- * duplicate information thereby increasing the number of bytes required
- * to be transmitted.
- * <p/>
- * The representation used by Neo4jPack and expected by the ValuePath
- * constructor here consists of three parts: a unique set of nodes within
- * the path, a similar unique set of unbound relationships (i.e. without
- * start and end information) and a list of path sequence information that
- * refers to the entities themselves. In PackStream structural representation,
- * this is as follows:
- * <p/>
- * <pre>
- *     Structure Path 'P' {
- *         List&lt;Node&gt; nodes
- *         List&lt;UnboundRelationship&gt; relationships
- *         List&lt;Integer&gt; sequence
- *     }
- *
- *     Structure UnboundRelationship 'r' {
- *         Identity identity
- *         String type
- *         Map&lt;String,Object&gt; properties
- *     }
- * </pre>
- * <p/>
- * Within the Path structure, several caveats apply. Firstly, while the nodes
- * may generally be listed in any order, a valid Path must contain at least
- * one node and the first such node must correspond to the path's start node.
- * The relationship list however may be empty (for zero length paths) and
- * relationships may appear in any order with no restriction.
- * <p/>
- * The sequence information contains alternating pointers to nodes and
- * relationships in the order in which they appear in the path. Each pointer
- * takes the form of an integer, which in the case of nodes simply references
- * the zero-based index of that node.
- * <p/>
- * Relationship pointers are less straightforward, using a one-based indexing
- * system (i.e. relationship #1 refers to the item 0 from the relationship
- * list. Additionally, the sign of the index is relevant: a positive index
- * denotes that the relationship was traversed with its direction, a
- * negative index denotes that the relationship was traversed against its
- * direction. Note that relationship items do not contain endpoint information,
- * this is described by this sequential context.
- * <p/>
- * Finally, the first sequence value will always be 0 by definition. Therefore,
- * this value is never actually transmitted and is instead reconstituted by the
- * receiving agent.
- * <p/>
- * Take as an example, the following path:
- * <pre>
- *     (a)--&gt;(b)&lt;--(a)--&gt;(c)--&gt;(d)
- * </pre>
- * Here, the nodes would be uniquely listed as [(a), (b), (c), (d)] and the
- * relationships as [(a:b), (a:c), (c:d)]. Applying zero-based and one-based
- * indexing to these lists respectively, we get:
- * <pre>
- *       0    1    2    3         1      2      3
- *     [(a), (b), (c), (d)]    [(a:b), (a:c), (c:d)]
- * </pre>
- * Applying these indexes to the original path then gives us:
- * <pre>
- *               (a)--&gt;(b)&lt;--(a)--&gt;(c)--&gt;(d)
- *     Node ID :  0     1     0     2     3
- *      Rel ID :     1     1     2     3
- * </pre>
- * And negating relationships that are traversed backwards, we get:
- * <pre>
- *               (a)--&gt;(b)&lt;--(a)--&gt;(c)--&gt;(d)
- *     Node ID :  0     1     0     2     3
- *      Rel ID :    +1    -1    +2    +3
- * </pre>
- * Finally, we can drop the leading 0 from the Path structure and combine the
- * sequence information with the other path data. This results in an overall
- * Path representation as below:
- * <pre>
- *     Structure Path 'P' {
- *         nodes         = [(a), (b), (c), (d)]
- *         relationships = [(a:b), (a:c), (c:d)]
- *         sequence      = [+1, 1, -1, 0, +2, 2, +3, 3]
- *     }
- * </pre>
- * Therefore, for the original path containing five nodes and four relationships,
- * we end up transmitting only four nodes, three unbound relationships and eight
- * bytes of sequence data (small integers require only a single byte in PackStream).
- */
-public class ValuePath implements Path
-{
-    private final int length;
-    private final List<Node> nodes;
-    private final List<Relationship> relationships;
-
-    // Used for iteration, built lazily
-    private List<PropertyContainer> entities;
-
-    public ValuePath( List<Node> nodes, List<Relationship> relationships, List<Integer> sequence )
-    {
-        // Check we have at least one node, the minimum required for a valid path.
-        assert nodes.size() >= 1;
-
-        // The full sequence length should always be odd (alternating nodes and relationships
-        // starting and ending with a node. But our definition allows us to infer that the
-        // first node will be at index 0, so we prepend that value rather than transmitting it.
-        List<Integer> fullSequence = new ArrayList<>( sequence );
-        if ( fullSequence.size() % 2 == 0 )
-        {
-            fullSequence.add( 0, 0 );
-        }
-
-        // Now that we have the full sequence, we can determine the overall path length.
-        int sequenceLength = fullSequence.size();
-        this.length = sequenceLength / 2;
-
-        // Load the nodes by pulling from the node list based on alternate sequence items.
-        this.nodes = new ArrayList<>( this.length + 1 );
-        for ( int i = 0; i < sequenceLength; i += 2 )
-        {
-            int index = fullSequence.get( i );
-            this.nodes.add( nodes.get( index ) );
-        }
-
-        // Similarly, load the relationships based on all the other sequence items.
-        this.relationships = new ArrayList<>( this.length );
-        for ( int i = 0; i < this.length; i++ )
-        {
-            // The relationship index value will not only be one-based but will be negative if
-            // the traversal happened against the direction of the underlying relationship.
-            int oneBasedIndex = fullSequence.get( 2 * i + 1 );
-            Relationship relationship;
-            Node startNode;
-            Node endNode;
-            if ( oneBasedIndex < 0 )
-            {
-                // Backward traversal (flip the sign)
-                relationship = relationships.get( (-oneBasedIndex) - 1 );
-                startNode = this.nodes.get( i + 1 );
-                endNode = this.nodes.get( i );
-            }
-            else
-            {
-                // Forward traversal (keep the sign)
-                relationship = relationships.get( oneBasedIndex - 1 );
-                startNode = this.nodes.get( i );
-                endNode = this.nodes.get( i + 1 );
-            }
-            if ( relationship instanceof UnboundRelationship )
-            {
-                // Convert an unbound relationship to a bound one
-                UnboundRelationship unboundRel = (UnboundRelationship) relationship;
-                relationship = unboundRel.bind( startNode, endNode );
-            }
-            this.relationships.add( relationship );
-        }
-    }
-
-    @Override
-    public Node startNode()
-    {
-        return nodes.get( 0 );
-    }
-
-    @Override
-    public Node endNode()
-    {
-        return nodes.get( length );
-    }
-
-    @Override
-    public Relationship lastRelationship()
-    {
-        if ( length == 0 )
-        {
-            return null;
-        }
-        else
-        {
-            return relationships.get( length - 1 );
-        }
-    }
-
-    @Override
-    public Iterable<Relationship> relationships()
-    {
-        return relationships;
-    }
-
-    @Override
-    public Iterable<Relationship> reverseRelationships()
-    {
-        // TODO: implement this
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Iterable<Node> nodes()
-    {
-        return nodes;
-    }
-
-    @Override
-    public Iterable<Node> reverseNodes()
-    {
-        // TODO: implement this
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public int length()
-    {
-        return length;
-    }
-
-    @Override
-    public Iterator<PropertyContainer> iterator()
-    {
-        // Build the entity list lazily only as and when we need it...
-        if ( entities == null )
-        {
-            entities = new ArrayList<>( 2 * length + 1 );
-            for ( int i = 0; i < length; i++ )
-            {
-                entities.add( nodes.get( i ) );
-                entities.add( relationships.get( i ) );
-            }
-            entities.add( nodes.get( length ) );
-        }
-        return entities.iterator();
-    }
-
-    @Override
-    public String toString()
-    {
-        return "ValuePath{" +
-                "nodes=" + nodes +
-                ", relationships=" + relationships +
-                '}';
-    }
-
-    @Override
-    public boolean equals( Object o )
-    {
-        if ( this == o )
-        {
-            return true;
-        }
-        if ( o == null || getClass() != o.getClass() )
-        {
-            return false;
-        }
-
-        ValuePath that = (ValuePath) o;
-
-        return nodes.equals( that.nodes ) && relationships.equals( that.relationships );
-
-    }
-
-    @Override
-    public int hashCode()
-    {
-        int result = nodes.hashCode();
-        result = 31 * result + relationships.hashCode();
-        return result;
-    }
-}
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/infrastructure/ValuePropertyContainer.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/infrastructure/ValuePropertyContainer.java
deleted file mode 100644
index f659b88dee89e..0000000000000
--- a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/infrastructure/ValuePropertyContainer.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2002-2017 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
- *
- * This file is part of Neo4j.
- *
- * Neo4j is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.neo4j.bolt.v1.messaging.infrastructure;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.neo4j.graphdb.PropertyContainer;
-
-public abstract class ValuePropertyContainer implements PropertyContainer
-{
-    private final Map<String, Object> props;
-
-    public ValuePropertyContainer( Map<String, Object> props )
-    {
-        this.props = props;
-    }
-
-    @Override
-    public Object getProperty( String s )
-    {
-        return props.get( s );
-    }
-
-    @Override
-    public Iterable<String> getPropertyKeys()
-    {
-        return props.keySet();
-    }
-
-    @Override
-    public Map<String, Object> getProperties( String... keys )
-    {
-        Map<String, Object> selected = new HashMap<>();
-        for ( String key : keys )
-        {
-            if ( props.containsKey( key ) )
-            {
-                selected.put( key, props.get( key ) );
-            }
-        }
-        return selected;
-    }
-
-    @Override
-    public Map<String, Object> getAllProperties()
-    {
-        return props;
-    }
-
-}
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/infrastructure/ValueRelationship.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/infrastructure/ValueRelationship.java
deleted file mode 100644
index 8c3f886346737..0000000000000
--- a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/infrastructure/ValueRelationship.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * Copyright (c) 2002-2017 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
- *
- * This file is part of Neo4j.
- *
- * Neo4j is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.neo4j.bolt.v1.messaging.infrastructure;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Map;
-
-import org.neo4j.bolt.v1.messaging.BoltIOException;
-import org.neo4j.bolt.v1.messaging.Neo4jPack;
-import org.neo4j.graphdb.GraphDatabaseService;
-import org.neo4j.graphdb.Node;
-import org.neo4j.graphdb.NotFoundException;
-import org.neo4j.graphdb.Relationship;
-import org.neo4j.graphdb.RelationshipType;
-import org.neo4j.kernel.api.exceptions.Status;
-
-public class ValueRelationship extends ValuePropertyContainer implements Relationship
-{
-    private static final int STRUCT_FIELD_COUNT = 5;
-
-    public static void pack( Neo4jPack.Packer packer, Relationship rel )
-            throws IOException
-    {
-        packer.packStructHeader( STRUCT_FIELD_COUNT, Neo4jPack.RELATIONSHIP );
-        packer.pack( rel.getId() );
-        packer.pack( rel.getStartNode().getId() );
-        packer.pack( rel.getEndNode().getId() );
-        packer.pack( rel.getType().name() );
-        //TODO: We should mark deleted relationships properly but that requires updates
-        // to protocol and clients.
-        try
-        {
-            Map<String,Object> properties = rel.getAllProperties();
-            packer.packRawMap( properties );
-        }
-        catch ( NotFoundException e )
-        {
-            //relationship was deleted, just send empty property map back
-            packer.packRawMap( Collections.emptyMap() );
-        }
-    }
-
-    public static ValueRelationship unpack( Neo4jPack.Unpacker unpacker )
-            throws IOException
-    {
-        long numFields = unpacker.unpackStructHeader();
-        char signature = unpacker.unpackStructSignature();
-        if ( signature != Neo4jPack.RELATIONSHIP )
-        {
-            throw new BoltIOException( Status.Request.InvalidFormat,
-                    "Expected a relationship structure, recieved 0x" + Integer.toHexString( signature ) );
-        }
-        if ( numFields != STRUCT_FIELD_COUNT )
-        {
-            throw new BoltIOException( Status.Request.InvalidFormat, "Relationship structures should have " + STRUCT_FIELD_COUNT
-                                                                     + " fields, structure sent contained " + numFields );
-        }
-        return unpackFields( unpacker );
-    }
-
-    public static ValueRelationship unpackFields( Neo4jPack.Unpacker unpacker )
-            throws IOException
-    {
-        long relId = unpacker.unpackLong();
-        long startNodeId = unpacker.unpackLong();
-        long endNodeId = unpacker.unpackLong();
-        String relTypeName = unpacker.unpackString();
-
-        Map<String, Object> props = unpacker.unpackMap();
-
-        RelationshipType relType = RelationshipType.withName( relTypeName );
-
-        return new ValueRelationship( relId, startNodeId, endNodeId, relType, props );
-    }
-
-    private final long id;
-    private final long startNode;
-    private final long endNode;
-    private final RelationshipType type;
-
-    public ValueRelationship( long id, long from, long to, RelationshipType type, Map<String, Object> props )
-    {
-        super( props );
-        this.id = id;
-        this.startNode = from;
-        this.endNode = to;
-        this.type = type;
-    }
-
-    @Override
-    public long getId()
-    {
-        return id;
-    }
-
-    @Override
-    public Node getStartNode()
-    {
-        return new ValueNode( startNode, null, null );
-    }
-
-    @Override
-    public Node getEndNode()
-    {
-        return new ValueNode( endNode, null, null );
-    }
-
-    @Override
-    public RelationshipType getType()
-    {
-        return type;
-    }
-
-    @Override
-    public Node getOtherNode( Node node )
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Node[] getNodes()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean isType( RelationshipType relationshipType )
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public GraphDatabaseService getGraphDatabase()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean hasProperty( String s )
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Object getProperty( String s, Object o )
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void setProperty( String s, Object o )
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Object removeProperty( String s )
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void delete()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public String toString()
-    {
-        return "ValueRelationship{" +
-                "id=" + id +
-                ", startNode=" + startNode +
-                ", endNode=" + endNode +
-                ", type=" + type +
-                ", props=" + getAllProperties() +
-                '}';
-    }
-
-    @Override
-    public boolean equals( Object o )
-    {
-        if ( this == o )
-        {
-            return true;
-        }
-        if ( o == null || getClass() != o.getClass() )
-        {
-            return false;
-        }
-
-        ValueRelationship that = (ValueRelationship) o;
-
-        if ( endNode != that.endNode )
-        {
-            return false;
-        }
-        if ( id != that.id )
-        {
-            return false;
-        }
-        return startNode == that.startNode &&
-                !(type != null ? !type.name().equals( that.type.name() ) : that.type != null);
-
-    }
-
-    @Override
-    public int hashCode()
-    {
-        int result = (int) (id ^ (id >>> 32));
-        result = 31 * result + (int) (startNode ^ (startNode >>> 32));
-        result = 31 * result + (int) (endNode ^ (endNode >>> 32));
-        result = 31 * result + (type != null ? type.hashCode() : 0);
-        return result;
-    }
-}
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/infrastructure/ValueUnboundRelationship.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/infrastructure/ValueUnboundRelationship.java
deleted file mode 100644
index d13a7aab038a0..0000000000000
--- a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/infrastructure/ValueUnboundRelationship.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Copyright (c) 2002-2017 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
- *
- * This file is part of Neo4j.
- *
- * Neo4j is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.neo4j.bolt.v1.messaging.infrastructure;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Map;
-
-import org.neo4j.bolt.v1.messaging.Neo4jPack;
-import org.neo4j.graphdb.GraphDatabaseService;
-import org.neo4j.graphdb.Node;
-import org.neo4j.graphdb.NotFoundException;
-import org.neo4j.graphdb.Relationship;
-import org.neo4j.graphdb.RelationshipType;
-
-public class ValueUnboundRelationship
-        extends ValuePropertyContainer
-        implements UnboundRelationship
-{
-    private static final int STRUCT_FIELD_COUNT = 3;
-
-    public static void pack( Neo4jPack.Packer packer, Relationship rel )
-            throws IOException
-    {
-        packer.packStructHeader( STRUCT_FIELD_COUNT, Neo4jPack.UNBOUND_RELATIONSHIP );
-        packer.pack( rel.getId() );
-        packer.pack( rel.getType().name() );
-        //TODO: We should mark deleted relationships properly but that requires updates
-        // to protocol and clients.
-        try
-        {
-            Map<String,Object> properties = rel.getAllProperties();
-            packer.packRawMap( properties );
-        }
-        catch ( NotFoundException e )
-        {
-            //relationship was deleted, just send empty property map back
-            packer.packRawMap( Collections.emptyMap() );
-        }
-    }
-
-    public static ValueUnboundRelationship unpack( Neo4jPack.Unpacker unpacker )
-            throws IOException
-    {
-        assert unpacker.unpackStructHeader() == STRUCT_FIELD_COUNT;
-        assert unpacker.unpackStructSignature() == Neo4jPack.UNBOUND_RELATIONSHIP;
-        return unpackFields( unpacker );
-    }
-
-    public static ValueUnboundRelationship unpackFields( Neo4jPack.Unpacker unpacker )
-            throws IOException
-    {
-        long relId = unpacker.unpackLong();
-        String relTypeName = unpacker.unpackString();
-
-        Map<String, Object> props = unpacker.unpackMap();
-
-        RelationshipType relType = RelationshipType.withName( relTypeName );
-
-        return new ValueUnboundRelationship( relId, relType, props );
-    }
-
-    public static ValueUnboundRelationship unbind( Relationship relationship )
-    {
-        Map<String, Object> props = relationship.getAllProperties();
-        return new ValueUnboundRelationship( relationship.getId(), relationship.getType(), props );
-    }
-
-    private final long id;
-    private final RelationshipType type;
-
-    public ValueUnboundRelationship( long id, RelationshipType type, Map<String, Object> props )
-    {
-        super( props );
-        this.id = id;
-        this.type = type;
-    }
-
-    public long getId()
-    {
-        return id;
-    }
-
-    @Override
-    public GraphDatabaseService getGraphDatabase()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean hasProperty( String key )
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Object getProperty( String key, Object defaultValue )
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void setProperty( String key, Object value )
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Object removeProperty( String key )
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    public RelationshipType getType()
-    {
-        return type;
-    }
-
-    @Override
-    public boolean isType( RelationshipType type )
-    {
-        return false;
-    }
-
-    @Override
-    public String toString()
-    {
-        return "ValueUnboundRelationship{" +
-                "id=" + id +
-                ", type=" + type +
-                ", props=" + getAllProperties() +
-                '}';
-    }
-
-    @Override
-    public boolean equals( Object o )
-    {
-        if ( this == o )
-        {
-            return true;
-        }
-        if ( !(o instanceof ValueUnboundRelationship) )
-        {
-            return false;
-        }
-
-        ValueUnboundRelationship that = (ValueUnboundRelationship) o;
-
-        if ( id != that.id )
-        {
-            return false;
-        }
-        if ( getAllProperties() != null ? !getAllProperties().equals( that.getAllProperties() )
-                                        : that.getAllProperties() != null )
-        {
-            return false;
-        }
-        return type != null ? type.equals( that.type ) : that.type == null;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        int result = (int) (id ^ (id >>> 32));
-        result = 31 * result + (type != null ? type.hashCode() : 0);
-        result = 31 * result + (getAllProperties() != null ? getAllProperties().hashCode() : 0);
-        return result;
-    }
-
-    @Override
-    public Relationship bind( Node startNode, Node endNode )
-    {
-        return new ValueRelationship( id, startNode.getId(), endNode.getId(), type, getAllProperties() );
-    }
-
-    @Override
-    public void delete()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Node getStartNode()
-    {
-        return null;
-    }
-
-    @Override
-    public Node getEndNode()
-    {
-        return null;
-    }
-
-    @Override
-    public Node getOtherNode( Node node )
-    {
-        return null;
-    }
-
-    @Override
-    public Node[] getNodes()
-    {
-        return new Node[0];
-    }
-
-}
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/BoltResponseHandler.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/BoltResponseHandler.java
index 32a5274b31dff..f2c1b0bf611e6 100644
--- a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/BoltResponseHandler.java
+++ b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/BoltResponseHandler.java
@@ -20,6 +20,7 @@
 package org.neo4j.bolt.v1.runtime;
 
 import org.neo4j.bolt.v1.runtime.spi.BoltResult;
+import org.neo4j.values.AnyValue;
 
 /**
  * Callback for handling the result of requests. For a given session, callbacks will be invoked serially,
@@ -33,7 +34,7 @@ public interface BoltResponseHandler
 
     void onRecords( BoltResult result, boolean pull ) throws Exception;
 
-    void onMetadata( String key, Object value );
+    void onMetadata( String key, AnyValue value );
 
     /** Called when the state machine ignores an operation, because it is waiting for an error to be acknowledged */
     void markIgnored();
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/BoltStateMachine.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/BoltStateMachine.java
index cb167fb36b895..cd4fe43297e9b 100644
--- a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/BoltStateMachine.java
+++ b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/BoltStateMachine.java
@@ -36,8 +36,11 @@
 import org.neo4j.kernel.api.exceptions.KernelException;
 import org.neo4j.kernel.api.exceptions.Status;
 import org.neo4j.kernel.api.exceptions.TransactionFailureException;
+import org.neo4j.values.AnyValue;
+import org.neo4j.values.storable.Values;
 
 import static org.neo4j.kernel.api.security.AuthToken.PRINCIPAL;
+import static org.neo4j.values.storable.Values.stringArray;
 
 /**
  * This state machine oversees the exchange of messages for the Bolt protocol.
@@ -112,8 +115,8 @@ private void after()
     /**
      * Initialize the session.
      */
-    public void init( String userAgent, Map<String, Object> authToken,
-                      BoltResponseHandler handler ) throws BoltConnectionFatality
+    public void init( String userAgent, Map<String,Object> authToken,
+            BoltResponseHandler handler ) throws BoltConnectionFatality
     {
         before( handler );
         try
@@ -129,12 +132,12 @@ public void init( String userAgent, Map<String, Object> authToken,
     /**
      * Clear any outstanding error condition. This differs from {@link #reset(BoltResponseHandler)} in two
      * important ways:
-     *
+     * <p>
      * 1) If there was an explicitly created transaction, the session will move back
-     *    to IN_TRANSACTION, rather than IDLE. This allows a more natural flow for client
-     *    side drivers, where explicitly opened transactions always are ended with COMMIT or ROLLBACK,
-     *    even if an error occurs. In all other cases, the session will move to the IDLE state.
-     *
+     * to IN_TRANSACTION, rather than IDLE. This allows a more natural flow for client
+     * side drivers, where explicitly opened transactions always are ended with COMMIT or ROLLBACK,
+     * even if an error occurs. In all other cases, the session will move to the IDLE state.
+     * <p>
      * 2) It will not interrupt any ahead-in-line messages.
      */
     public void ackFailure( BoltResponseHandler handler ) throws BoltConnectionFatality
@@ -153,15 +156,15 @@ public void ackFailure( BoltResponseHandler handler ) throws BoltConnectionFatal
     /**
      * Reset the session to an IDLE state. This clears any outstanding failure condition, disposes
      * of any outstanding result records and rolls back the current transaction (if any).
-     *
+     * <p>
      * This differs from {@link #ackFailure(BoltResponseHandler)} in that it is more "radical" - it does not
      * matter what the state of the session is, as long as it is open, reset will move it back to IDLE.
-     *
+     * <p>
      * This is designed to cater to two use cases:
-     *
+     * <p>
      * 1) Rather than create new sessions over and over, drivers can maintain a pool of sessions,
-     *    and reset them before each re-use. Since establishing sessions can be high overhead,
-     *    this is quite helpful.
+     * and reset them before each re-use. Since establishing sessions can be high overhead,
+     * this is quite helpful.
      * 2) Kill any stuck or long running operation
      */
     public void reset( BoltResponseHandler handler ) throws BoltConnectionFatality
@@ -184,7 +187,7 @@ public void reset( BoltResponseHandler handler ) throws BoltConnectionFatality
      * {@link #pullAll(BoltResponseHandler) pulled} or {@link #discardAll(BoltResponseHandler)
      * discarded}.
      */
-    public void run( String statement, Map<String, Object> params, BoltResponseHandler handler )
+    public void run( String statement, Map<String,Object> params, BoltResponseHandler handler )
             throws BoltConnectionFatality
     {
         long start = clock.millis();
@@ -192,7 +195,7 @@ public void run( String statement, Map<String, Object> params, BoltResponseHandl
         try
         {
             state = state.run( this, statement, params );
-            handler.onMetadata( "result_available_after", clock.millis() - start );
+            handler.onMetadata( "result_available_after", Values.longValue( clock.millis() - start ) );
         }
         finally
         {
@@ -247,11 +250,11 @@ public String key()
      * and will then ignore all inbound messages until a {@link #reset(BoltResponseHandler) reset}
      * message is received. If this is called multiple times, an equivalent number
      * of reset messages must be received before the SSM goes back to a good state.
-     *
+     * <p>
      * You can imagine this is as a "call ahead" mechanism used by RESET to
      * cancel any statements ahead of it in line, without compromising the single-
      * threaded processing of messages that the state machine does.
-     *
+     * <p>
      * This can be used to cancel a long-running statement or transaction.
      */
     public void interrupt()
@@ -338,7 +341,7 @@ public enum State
                 {
                     @Override
                     public State init( BoltStateMachine machine, String userAgent,
-                                       Map<String, Object> authToken ) throws BoltConnectionFatality
+                            Map<String,Object> authToken ) throws BoltConnectionFatality
                     {
                         try
                         {
@@ -346,9 +349,9 @@ public State init( BoltStateMachine machine, String userAgent,
                             machine.ctx.init( authResult );
                             if ( authResult.credentialsExpired() )
                             {
-                                machine.ctx.onMetadata( "credentials_expired", true );
+                                machine.ctx.onMetadata( "credentials_expired", Values.TRUE );
                             }
-                            machine.ctx.onMetadata( "server", machine.spi.version() );
+                            machine.ctx.onMetadata( "server", Values.stringValue( machine.spi.version() ) );
 
                             machine.spi.udcRegisterClient( userAgent );
                             if ( authToken.containsKey( PRINCIPAL ) )
@@ -388,12 +391,13 @@ public State init( BoltStateMachine machine, String userAgent,
                 {
                     @Override
                     public State run( BoltStateMachine machine, String statement,
-                                      Map<String, Object> params ) throws BoltConnectionFatality
+                            Map<String,Object> params ) throws BoltConnectionFatality
                     {
                         try
                         {
-                            StatementMetadata statementMetadata = machine.ctx.statementProcessor.run( statement, params );
-                            machine.ctx.onMetadata( "fields", statementMetadata.fieldNames() );
+                            StatementMetadata statementMetadata =
+                                    machine.ctx.statementProcessor.run( statement, params );
+                            machine.ctx.onMetadata( "fields", stringArray( statementMetadata.fieldNames() ) );
                             return STREAMING;
                         }
                         catch ( AuthorizationExpiredException e )
@@ -514,7 +518,7 @@ public State ackFailure( BoltStateMachine machine ) throws BoltConnectionFatalit
 
                     @Override
                     public State run( BoltStateMachine machine, String statement,
-                                      Map<String, Object> params )
+                            Map<String,Object> params )
                     {
                         machine.ctx.markIgnored();
                         return FAILED;
@@ -568,7 +572,7 @@ public State ackFailure( BoltStateMachine machine ) throws BoltConnectionFatalit
                     }
 
                     @Override
-                    public State run( BoltStateMachine machine, String statement, Map<String, Object>
+                    public State run( BoltStateMachine machine, String statement, Map<String,Object>
                             params ) throws BoltConnectionFatality
                     {
                         machine.ctx.markIgnored();
@@ -590,7 +594,7 @@ public State discardAll( BoltStateMachine machine ) throws BoltConnectionFatalit
                     }
                 };
 
-        public State init( BoltStateMachine machine, String userAgent, Map<String, Object> authToken )
+        public State init( BoltStateMachine machine, String userAgent, Map<String,Object> authToken )
                 throws BoltConnectionFatality
         {
             String msg = "INIT cannot be handled by a session in the " + name() + " state.";
@@ -621,7 +625,7 @@ public State reset( BoltStateMachine machine ) throws BoltConnectionFatality
             throw new BoltProtocolBreachFatality( msg );
         }
 
-        public State run( BoltStateMachine machine, String statement, Map<String, Object> params ) throws
+        public State run( BoltStateMachine machine, String statement, Map<String,Object> params ) throws
                 BoltConnectionFatality
         {
             String msg = "RUN cannot be handled by a session in the " + name() + " state.";
@@ -716,7 +720,7 @@ private void init( AuthenticationResult authenticationResult )
         }
 
         private void setQuerySourceFromClientNameAndPrincipal( String clientName, String principal,
-                                                               BoltConnectionDescriptor connectionDescriptor )
+                BoltConnectionDescriptor connectionDescriptor )
         {
             String principalName = principal == null ? "null" : principal;
             statementProcessor.setQuerySource( new BoltQuerySource( principalName, clientName, connectionDescriptor ) );
@@ -740,7 +744,7 @@ public void onRecords( BoltResult result, boolean pull ) throws Exception
         }
 
         @Override
-        public void onMetadata( String key, Object value )
+        public void onMetadata( String key, AnyValue value )
         {
             if ( responseHandler != null )
             {
@@ -781,7 +785,7 @@ interface SPI
     {
         void reportError( Neo4jError err );
 
-        AuthenticationResult authenticate( Map<String, Object> authToken ) throws AuthenticationException;
+        AuthenticationResult authenticate( Map<String,Object> authToken ) throws AuthenticationException;
 
         void udcRegisterClient( String clientName );
 
@@ -799,13 +803,13 @@ interface SPI
     private static class NullStatementProcessor implements StatementProcessor
     {
         @Override
-        public StatementMetadata run( String statement, Map<String, Object> params ) throws KernelException
+        public StatementMetadata run( String statement, Map<String,Object> params ) throws KernelException
         {
             throw new UnsupportedOperationException( "Unable to run any statements." );
         }
 
         @Override
-        public void streamResult( ThrowingConsumer<BoltResult, Exception> resultConsumer ) throws Exception
+        public void streamResult( ThrowingConsumer<BoltResult,Exception> resultConsumer ) throws Exception
         {
             throw new UnsupportedOperationException( "Unable to stream any results." );
         }
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/CypherAdapterStream.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/CypherAdapterStream.java
index b0a6158afddaa..f5cbb3699d322 100644
--- a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/CypherAdapterStream.java
+++ b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/CypherAdapterStream.java
@@ -34,6 +34,13 @@
 import org.neo4j.graphdb.QueryStatistics;
 import org.neo4j.values.AnyValue;
 import org.neo4j.values.result.QueryResult;
+import org.neo4j.values.storable.Values;
+import org.neo4j.values.virtual.MapValue;
+import org.neo4j.values.virtual.VirtualValues;
+
+import static org.neo4j.values.storable.Values.intValue;
+import static org.neo4j.values.storable.Values.longValue;
+import static org.neo4j.values.storable.Values.stringValue;
 
 class CypherAdapterStream extends BoltResult
 {
@@ -71,13 +78,13 @@ public void accept( final Visitor visitor ) throws Exception
             visitor.visit( currentRecord.reset( row ) );
             return true;
         } );
-        visitor.addMetadata( "result_consumed_after", clock.millis() - start );
+        visitor.addMetadata( "result_consumed_after", longValue( clock.millis() - start ) );
         QueryExecutionType qt = delegate.executionType();
-        visitor.addMetadata( "type", queryTypeCode( qt.queryType() ) );
+        visitor.addMetadata( "type", Values.stringValue( queryTypeCode( qt.queryType() ) ) );
 
         if ( delegate.queryStatistics().containsUpdates() )
         {
-            Object stats = queryStats( delegate.queryStatistics() );
+            MapValue stats = queryStats( delegate.queryStatistics() );
             visitor.addMetadata( "stats", stats );
         }
         if ( qt.requestedExecutionPlanDescription() )
@@ -94,9 +101,9 @@ public void accept( final Visitor visitor ) throws Exception
         }
     }
 
-    private Map<String, Integer> queryStats( QueryStatistics queryStatistics )
+    private MapValue queryStats( QueryStatistics queryStatistics )
     {
-        Map<String, Integer> result = new HashMap<>();
+        Map<String,AnyValue> result = new HashMap<>();
         addIfNonZero( result, "nodes-created", queryStatistics.getNodesCreated() );
         addIfNonZero( result, "nodes-deleted", queryStatistics.getNodesDeleted() );
         addIfNonZero( result, "relationships-created", queryStatistics.getRelationshipsCreated() );
@@ -108,14 +115,14 @@ private Map<String, Integer> queryStats( QueryStatistics queryStatistics )
         addIfNonZero( result, "indexes-removed", queryStatistics.getIndexesRemoved() );
         addIfNonZero( result, "constraints-added", queryStatistics.getConstraintsAdded() );
         addIfNonZero( result, "constraints-removed", queryStatistics.getConstraintsRemoved() );
-        return result;
+        return VirtualValues.map( result );
     }
 
-    private void addIfNonZero( Map<String, Integer> map, String name, int count )
+    private void addIfNonZero( Map<String,AnyValue> map, String name, int count )
     {
         if ( count > 0 )
         {
-            map.put( name, count );
+            map.put( name, intValue( count ) );
         }
     }
 
@@ -123,20 +130,20 @@ private String queryTypeCode( QueryExecutionType.QueryType queryType )
     {
         switch ( queryType )
         {
-            case READ_ONLY:
-                return "r";
+        case READ_ONLY:
+            return "r";
 
-            case READ_WRITE:
-                return "rw";
+        case READ_WRITE:
+            return "rw";
 
-            case WRITE:
-                return "w";
+        case WRITE:
+            return "w";
 
-            case SCHEMA_WRITE:
-                return "s";
+        case SCHEMA_WRITE:
+            return "s";
 
-            default:
-                return queryType.name();
+        default:
+            return queryType.name();
         }
     }
 
@@ -167,31 +174,31 @@ public CypherAdapterRecord reset( QueryResult.Record cypherRecord ) throws BoltI
 
     private static class NotificationConverter
     {
-        public static Object convert( Iterable<Notification> notifications )
+        public static AnyValue convert( Iterable<Notification> notifications )
         {
-            List<Object> out = new ArrayList<>();
+            List<AnyValue> out = new ArrayList<>();
             for ( Notification notification : notifications )
             {
-                Map<String, Object> notificationMap = new HashMap<>( 4 );
-                notificationMap.put( "code", notification.getCode() );
-                notificationMap.put( "title", notification.getTitle() );
-                notificationMap.put( "description", notification.getDescription() );
-                notificationMap.put( "severity", notification.getSeverity().toString() );
+                Map<String,AnyValue> notificationMap = new HashMap<>( 4 );
+                notificationMap.put( "code", stringValue( notification.getCode() ) );
+                notificationMap.put( "title", stringValue( notification.getTitle() ) );
+                notificationMap.put( "description", stringValue( notification.getDescription() ) );
+                notificationMap.put( "severity", stringValue( notification.getSeverity().toString() ) );
 
                 InputPosition pos = notification.getPosition(); // position is optional
                 if ( !pos.equals( InputPosition.empty ) )
                 {
                     // only add the position if it is not empty
-                    Map<String,Object> posMap = new HashMap<>( 3 );
-                    posMap.put( "offset", pos.getOffset() );
-                    posMap.put( "line", pos.getLine() );
-                    posMap.put( "column", pos.getColumn() );
-                    notificationMap.put( "position", posMap );
+                    Map<String,AnyValue> posMap = new HashMap<>( 3 );
+                    posMap.put( "offset", intValue( pos.getOffset() ) );
+                    posMap.put( "line", intValue( pos.getLine() ) );
+                    posMap.put( "column", intValue( pos.getColumn() ) );
+                    notificationMap.put( "position", VirtualValues.map( posMap ) );
                 }
 
-                out.add( notificationMap );
+                out.add( VirtualValues.map( notificationMap ) );
             }
-            return out;
+            return VirtualValues.fromList( out );
         }
     }
 }
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/ExecutionPlanConverter.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/ExecutionPlanConverter.java
index 22c22b1544800..3695516a29949 100644
--- a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/ExecutionPlanConverter.java
+++ b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/ExecutionPlanConverter.java
@@ -25,6 +25,15 @@
 import java.util.Map;
 
 import org.neo4j.graphdb.ExecutionPlanDescription;
+import org.neo4j.values.AnyValue;
+import org.neo4j.values.AnyValues;
+import org.neo4j.values.virtual.ListValue;
+import org.neo4j.values.virtual.MapValue;
+import org.neo4j.values.virtual.VirtualValues;
+
+import static org.neo4j.values.storable.Values.doubleValue;
+import static org.neo4j.values.storable.Values.longValue;
+import static org.neo4j.values.storable.Values.stringValue;
 
 /** Takes execution plans and converts them to the subset of types used in the Neo4j type system */
 class ExecutionPlanConverter
@@ -33,32 +42,32 @@ private ExecutionPlanConverter()
     {
     }
 
-    public static Map<String, Object> convert( ExecutionPlanDescription plan )
+    public static MapValue convert( ExecutionPlanDescription plan )
     {
-        Map<String, Object> out = new HashMap<>();
-        out.put( "operatorType", plan.getName() );
-        out.put( "args", plan.getArguments() );
-        out.put( "identifiers", plan.getIdentifiers() );
+        Map<String,AnyValue> out = new HashMap<>();
+        out.put( "operatorType", stringValue( plan.getName() ) );
+        out.put( "args", AnyValues.asMapValue( plan.getArguments() ) );
+        out.put( "identifiers", AnyValues.asListValue( plan.getIdentifiers() ) );
         out.put( "children", children( plan ) );
         if ( plan.hasProfilerStatistics() )
         {
             ExecutionPlanDescription.ProfilerStatistics profile = plan.getProfilerStatistics();
-            out.put( "dbHits", profile.getDbHits() );
-            out.put( "pageCacheHits", profile.getPageCacheHits() );
-            out.put( "pageCacheMisses", profile.getPageCacheMisses() );
-            out.put( "pageCacheHitRatio", profile.getPageCacheHitRatio() );
-            out.put( "rows", profile.getRows() );
+            out.put( "dbHits", longValue( profile.getDbHits() ) );
+            out.put( "pageCacheHits", longValue( profile.getPageCacheHits() ) );
+            out.put( "pageCacheMisses", longValue( profile.getPageCacheMisses() ) );
+            out.put( "pageCacheHitRatio", doubleValue( profile.getPageCacheHitRatio() ) );
+            out.put( "rows", longValue( profile.getRows() ) );
         }
-        return out;
+        return VirtualValues.map( out );
     }
 
-    private static List<Map<String,Object>> children( ExecutionPlanDescription plan )
+    private static ListValue children( ExecutionPlanDescription plan )
     {
-        List<Map<String, Object>> children = new LinkedList<>();
+        List<AnyValue> children = new LinkedList<>();
         for ( ExecutionPlanDescription child : plan.getChildren() )
         {
             children.add( convert( child ) );
         }
-        return children;
+        return VirtualValues.fromList( children );
     }
 }
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/spi/BoltResult.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/spi/BoltResult.java
index 97e34e10d7ce1..4a7db6211afd5 100644
--- a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/spi/BoltResult.java
+++ b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/spi/BoltResult.java
@@ -19,6 +19,7 @@
  */
 package org.neo4j.bolt.v1.runtime.spi;
 
+import org.neo4j.values.AnyValue;
 import org.neo4j.values.result.QueryResult;
 
 /**
@@ -44,7 +45,7 @@ public interface Visitor
         /**
          * Associate arbitrary metadata with the result stream. This will get transferred at the end of the stream.
          * Please stick to Neo4j type system types (Map, List, Integer, Float, Boolean, String etc) */
-        void addMetadata( String key, Object value );
+        void addMetadata( String key, AnyValue value );
     }
 
     public static final BoltResult EMPTY = new BoltResult()
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/spi/BookmarkResult.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/spi/BookmarkResult.java
index b510171ec7055..3202800529a95 100644
--- a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/spi/BookmarkResult.java
+++ b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/spi/BookmarkResult.java
@@ -21,6 +21,8 @@
 
 import org.neo4j.bolt.v1.runtime.bookmarking.Bookmark;
 
+import static org.neo4j.values.storable.Values.stringValue;
+
 public class BookmarkResult extends BoltResult
 {
     private final Bookmark bookmark;
@@ -39,7 +41,7 @@ public String[] fieldNames()
     @Override
     public void accept( Visitor visitor ) throws Exception
     {
-        visitor.addMetadata( "bookmark", bookmark.toString() );
+        visitor.addMetadata( "bookmark", stringValue( bookmark.toString() ) );
     }
 
     @Override
diff --git a/community/bolt/src/test/java/org/neo4j/bolt/testing/BoltMatchers.java b/community/bolt/src/test/java/org/neo4j/bolt/testing/BoltMatchers.java
index 72faa664af063..bbcfcb382abcf 100644
--- a/community/bolt/src/test/java/org/neo4j/bolt/testing/BoltMatchers.java
+++ b/community/bolt/src/test/java/org/neo4j/bolt/testing/BoltMatchers.java
@@ -34,6 +34,7 @@
 import org.neo4j.function.ThrowingAction;
 import org.neo4j.function.ThrowingBiConsumer;
 import org.neo4j.kernel.api.exceptions.Status;
+import org.neo4j.values.AnyValue;
 
 import static java.lang.String.format;
 import static org.junit.Assert.assertEquals;
@@ -43,6 +44,7 @@
 import static org.neo4j.bolt.v1.messaging.BoltResponseMessage.SUCCESS;
 import static org.neo4j.bolt.v1.runtime.BoltStateMachine.State.READY;
 import static org.neo4j.bolt.v1.runtime.MachineRoom.newMachine;
+import static org.neo4j.values.storable.Values.stringValue;
 
 public class BoltMatchers
 {
@@ -69,7 +71,7 @@ public void describeTo( Description description )
         };
     }
 
-    public static Matcher<RecordedBoltResponse> succeededWithMetadata( final String key, final Object value )
+    public static Matcher<RecordedBoltResponse> succeededWithMetadata( final String key, final AnyValue value )
     {
         return new BaseMatcher<RecordedBoltResponse>()
         {
@@ -161,7 +163,7 @@ public boolean matches( final Object item )
                 final RecordedBoltResponse response = (RecordedBoltResponse) item;
                 return response.message() == FAILURE &&
                         response.hasMetadata( "code" ) &&
-                        response.metadata( "code" ).equals( status.code().serialize() );
+                        response.metadata( "code" ).equals( stringValue( status.code().serialize() ) );
             }
 
             @Override
diff --git a/community/bolt/src/test/java/org/neo4j/bolt/testing/BoltResponseRecorder.java b/community/bolt/src/test/java/org/neo4j/bolt/testing/BoltResponseRecorder.java
index a733680f12879..3e191a8ae3490 100644
--- a/community/bolt/src/test/java/org/neo4j/bolt/testing/BoltResponseRecorder.java
+++ b/community/bolt/src/test/java/org/neo4j/bolt/testing/BoltResponseRecorder.java
@@ -25,6 +25,7 @@
 import org.neo4j.bolt.v1.runtime.BoltResponseHandler;
 import org.neo4j.bolt.v1.runtime.Neo4jError;
 import org.neo4j.bolt.v1.runtime.spi.BoltResult;
+import org.neo4j.values.AnyValue;
 import org.neo4j.values.result.QueryResult;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
@@ -32,6 +33,8 @@
 import static org.neo4j.bolt.v1.messaging.BoltResponseMessage.FAILURE;
 import static org.neo4j.bolt.v1.messaging.BoltResponseMessage.IGNORED;
 import static org.neo4j.bolt.v1.messaging.BoltResponseMessage.SUCCESS;
+import static org.neo4j.values.storable.Values.stringOrNoValue;
+import static org.neo4j.values.storable.Values.stringValue;
 
 public class BoltResponseRecorder implements BoltResponseHandler
 {
@@ -66,7 +69,7 @@ public void visit( QueryResult.Record record ) throws Exception
             }
 
             @Override
-            public void addMetadata( String key, Object value )
+            public void addMetadata( String key, AnyValue value )
             {
                 currentResponse.addMetadata( key, value );
             }
@@ -74,7 +77,7 @@ public void addMetadata( String key, Object value )
     }
 
     @Override
-    public void onMetadata( String key, Object value )
+    public void onMetadata( String key, AnyValue value )
     {
         currentResponse.addMetadata( key, value );
     }
@@ -89,8 +92,8 @@ public void markIgnored()
     public void markFailed( Neo4jError error )
     {
         currentResponse.setResponse( FAILURE );
-        onMetadata( "code", error.status().code().serialize() );
-        onMetadata( "message", error.message() );
+        onMetadata( "code", stringValue( error.status().code().serialize() ) );
+        onMetadata( "message", stringOrNoValue( error.message() ) );
     }
 
     @Override
diff --git a/community/bolt/src/test/java/org/neo4j/bolt/testing/NullResponseHandler.java b/community/bolt/src/test/java/org/neo4j/bolt/testing/NullResponseHandler.java
index 82bd554d632ce..93f1ebf302155 100644
--- a/community/bolt/src/test/java/org/neo4j/bolt/testing/NullResponseHandler.java
+++ b/community/bolt/src/test/java/org/neo4j/bolt/testing/NullResponseHandler.java
@@ -22,6 +22,7 @@
 import org.neo4j.bolt.v1.runtime.BoltResponseHandler;
 import org.neo4j.bolt.v1.runtime.Neo4jError;
 import org.neo4j.bolt.v1.runtime.spi.BoltResult;
+import org.neo4j.values.AnyValue;
 
 /**
  * Used by tests when the response for a request is not relevant.
@@ -52,7 +53,7 @@ public void onRecords( BoltResult result, boolean pull ) throws Exception
     }
 
     @Override
-    public void onMetadata( String key, Object value )
+    public void onMetadata( String key, AnyValue value )
     {
         // this page intentionally left blank
     }
diff --git a/community/bolt/src/test/java/org/neo4j/bolt/testing/RecordedBoltResponse.java b/community/bolt/src/test/java/org/neo4j/bolt/testing/RecordedBoltResponse.java
index 504937ac08955..831e138ad2dbc 100644
--- a/community/bolt/src/test/java/org/neo4j/bolt/testing/RecordedBoltResponse.java
+++ b/community/bolt/src/test/java/org/neo4j/bolt/testing/RecordedBoltResponse.java
@@ -26,6 +26,7 @@
 
 import org.neo4j.bolt.v1.messaging.BoltResponseMessage;
 import org.neo4j.bolt.v1.runtime.spi.Record;
+import org.neo4j.values.AnyValue;
 import org.neo4j.values.result.QueryResult;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -36,7 +37,7 @@ public class RecordedBoltResponse
 {
     private List<QueryResult.Record> records;
     private BoltResponseMessage response;
-    private Map<String, Object> metadata;
+    private Map<String, AnyValue> metadata;
 
     public RecordedBoltResponse()
     {
@@ -50,7 +51,7 @@ public void addRecord( QueryResult.Record record )
         records.add( record );
     }
 
-    public void addMetadata( String key, Object value )
+    public void addMetadata( String key, AnyValue value )
     {
         metadata.put( key, value );
     }
diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/BoltRequestMessageTest.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/BoltRequestMessageTest.java
index 798ae6bc4344b..5694cdcc6dfd0 100644
--- a/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/BoltRequestMessageTest.java
+++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/BoltRequestMessageTest.java
@@ -26,19 +26,18 @@
 import java.io.IOException;
 import java.util.Map;
 
-import org.neo4j.bolt.v1.messaging.infrastructure.ValueNode;
-import org.neo4j.bolt.v1.messaging.infrastructure.ValueRelationship;
 import org.neo4j.bolt.v1.messaging.message.RecordMessage;
 import org.neo4j.bolt.v1.messaging.message.RequestMessage;
 import org.neo4j.bolt.v1.messaging.message.RunMessage;
 import org.neo4j.bolt.v1.packstream.BufferedChannelInput;
 import org.neo4j.bolt.v1.packstream.BufferedChannelOutput;
-import org.neo4j.graphdb.RelationshipType;
 import org.neo4j.kernel.impl.util.HexPrinter;
-import org.neo4j.values.AnyValues;
+import org.neo4j.values.AnyValue;
+import org.neo4j.values.virtual.EdgeValue;
+import org.neo4j.values.virtual.NodeValue;
+import org.neo4j.values.virtual.VirtualValues;
 
 import static java.lang.System.lineSeparator;
-import static java.util.Arrays.asList;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.neo4j.bolt.v1.messaging.BoltResponseMessageWriter.NO_BOUNDARY_HOOK;
@@ -50,8 +49,13 @@
 import static org.neo4j.bolt.v1.messaging.message.RunMessage.run;
 import static org.neo4j.bolt.v1.messaging.util.MessageMatchers.serialize;
 import static org.neo4j.bolt.v1.runtime.spi.Records.record;
-import static org.neo4j.graphdb.Label.label;
 import static org.neo4j.helpers.collection.MapUtil.map;
+import static org.neo4j.values.storable.Values.intValue;
+import static org.neo4j.values.storable.Values.stringArray;
+import static org.neo4j.values.storable.Values.stringValue;
+import static org.neo4j.values.virtual.VirtualValues.edgeValue;
+import static org.neo4j.values.virtual.VirtualValues.map;
+import static org.neo4j.values.virtual.VirtualValues.nodeValue;
 
 public class BoltRequestMessageTest
 {
@@ -87,10 +91,9 @@ public void shouldHandleParameterizedStatements() throws Throwable
     @Test
     public void shouldSerializeNode() throws Throwable
     {
-        ValueNode valueNode = new ValueNode( 12L, asList( label( "User" ), label( "Banana" ) ),
-                map( "name", "Bob", "age", 14 ) );
-
-        assertThat( serialized( valueNode ),
+        NodeValue nodeValue = nodeValue( 12L, stringArray( "User", "Banana" ), map( new String[]{"name", "age"},
+                new AnyValue[]{stringValue( "Bob" ), intValue( 14 )} ) );
+        assertThat( serialized( nodeValue ),
                 equalTo( "B1 71 91 B3 4E 0C 92 84 55 73 65 72 86 42 61 6E" + lineSeparator() +
                          "61 6E 61 A2 84 6E 61 6D 65 83 42 6F 62 83 61 67" + lineSeparator() +
                          "65 0E" ) );
@@ -99,18 +102,20 @@ public void shouldSerializeNode() throws Throwable
     @Test
     public void shouldSerializeRelationship() throws Throwable
     {
-        ValueRelationship valueRelationship = new ValueRelationship( 12L, 1L, 2L, RelationshipType.withName( "KNOWS" ),
-                map( "name", "Bob", "age", 14 ) );
-
-        assertThat( serialized( valueRelationship ),
+        EdgeValue edgeValue = edgeValue( 12L,
+                nodeValue( 1L, stringArray(), VirtualValues.EMPTY_MAP ),
+                nodeValue( 2L, stringArray(), VirtualValues.EMPTY_MAP ),
+                stringValue( "KNOWS" ), map( new String[]{"name", "age"},
+                        new AnyValue[]{stringValue( "Bob" ), intValue( 14 )} ) );
+        assertThat( serialized( edgeValue ),
                 equalTo( "B1 71 91 B5 52 0C 01 02 85 4B 4E 4F 57 53 A2 84" + lineSeparator() +
                          "6E 61 6D 65 83 42 6F 62 83 61 67 65 0E" ) );
     }
 
-    private String serialized( Object object ) throws IOException
+    private String serialized( AnyValue object ) throws IOException
     {
         RecordMessage message =
-                new RecordMessage( record( AnyValues.of( object ) ) );
+                new RecordMessage( record( object ) );
         return HexPrinter.hex( serialize( message ), 4, " " );
     }
 
diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/BoltRequestMessageWriter.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/BoltRequestMessageWriter.java
index 12c07d2a02fa2..28fcbb83a3bc3 100644
--- a/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/BoltRequestMessageWriter.java
+++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/BoltRequestMessageWriter.java
@@ -24,6 +24,7 @@
 
 import org.neo4j.bolt.v1.messaging.message.RequestMessage;
 import org.neo4j.bolt.v1.runtime.Neo4jError;
+import org.neo4j.values.AnyValues;
 
 import static org.neo4j.bolt.v1.messaging.BoltRequestMessage.ACK_FAILURE;
 import static org.neo4j.bolt.v1.messaging.BoltRequestMessage.DISCARD_ALL;
@@ -52,11 +53,11 @@ public BoltRequestMessageWriter write( RequestMessage message ) throws IOExcepti
     }
 
     @Override
-    public void onInit( String clientName, Map<String, Object> credentials ) throws IOException
+    public void onInit( String clientName, Map<String,Object> credentials ) throws IOException
     {
         packer.packStructHeader( 1, INIT.signature() );
         packer.pack( clientName );
-        packer.packRawMap( credentials );
+        packer.packRawMap( AnyValues.asMapValue( credentials ) );
         onMessageComplete.onMessageComplete();
     }
 
@@ -75,12 +76,12 @@ public void onReset() throws IOException
     }
 
     @Override
-    public void onRun( String statement, Map<String, Object> params )
+    public void onRun( String statement, Map<String,Object> params )
             throws IOException
     {
         packer.packStructHeader( 2, RUN.signature() );
         packer.pack( statement );
-        packer.packRawMap( params );
+        packer.packRawMap( AnyValues.asMapValue( params ) );
         onMessageComplete.onMessageComplete();
     }
 
diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/BoltResponseMessageReader.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/BoltResponseMessageReader.java
index 7cc4aaf37aab9..264ea893e036a 100644
--- a/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/BoltResponseMessageReader.java
+++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/BoltResponseMessageReader.java
@@ -20,12 +20,12 @@
 package org.neo4j.bolt.v1.messaging;
 
 import java.io.IOException;
-import java.util.Map;
 
 import org.neo4j.bolt.v1.packstream.PackStream;
 import org.neo4j.kernel.api.exceptions.Status;
 import org.neo4j.values.AnyValue;
-import org.neo4j.values.AnyValues;
+import org.neo4j.values.storable.StringValue;
+import org.neo4j.values.virtual.MapValue;
 
 import static org.neo4j.bolt.v1.runtime.Neo4jError.codeFromString;
 import static org.neo4j.bolt.v1.runtime.spi.Records.record;
@@ -56,7 +56,7 @@ public <E extends Exception> void read( BoltResponseMessageHandler<E> handler )
                 switch ( message )
                 {
                 case SUCCESS:
-                    Map<String, Object> successMetadata = unpacker.unpackMap();
+                    MapValue successMetadata = unpacker.unpackMap();
                     handler.onSuccess( successMetadata );
                     break;
                 case RECORD:
@@ -64,7 +64,7 @@ public <E extends Exception> void read( BoltResponseMessageHandler<E> handler )
                     final AnyValue[] fields = new AnyValue[(int) length];
                     for ( int i = 0; i < length; i++ )
                     {
-                        fields[i] = AnyValues.of(unpacker.unpack());
+                        fields[i] = unpacker.unpack();
                     }
                     handler.onRecord( record( fields ) );
                     break;
@@ -72,12 +72,12 @@ public <E extends Exception> void read( BoltResponseMessageHandler<E> handler )
                     handler.onIgnored();
                     break;
                 case FAILURE:
-                    Map<String, Object> failureMetadata = unpacker.unpackMap();
+                    MapValue failureMetadata = unpacker.unpackMap();
                     String code = failureMetadata.containsKey( "code" ) ?
-                            (String) failureMetadata.get( "code" ) :
+                                  ((StringValue) failureMetadata.get( "code" )).stringValue() :
                             Status.General.UnknownError.name();
                     String msg = failureMetadata.containsKey( "message" ) ?
-                            (String) failureMetadata.get( "message" ) :
+                                 ((StringValue) failureMetadata.get( "message" )).stringValue() :
                             "<No message supplied>";
                     handler.onFailure( codeFromString( code ), msg );
                     break;
diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/BoltResponseMessageRecorder.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/BoltResponseMessageRecorder.java
index 87a4c6f0d75a7..bf5edb9f9ee41 100644
--- a/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/BoltResponseMessageRecorder.java
+++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/BoltResponseMessageRecorder.java
@@ -19,8 +19,6 @@
  */
 package org.neo4j.bolt.v1.messaging;
 
-import java.util.Map;
-
 import org.neo4j.bolt.v1.messaging.message.FailureMessage;
 import org.neo4j.bolt.v1.messaging.message.IgnoredMessage;
 import org.neo4j.bolt.v1.messaging.message.RecordMessage;
@@ -28,11 +26,12 @@
 import org.neo4j.bolt.v1.messaging.message.SuccessMessage;
 import org.neo4j.kernel.api.exceptions.Status;
 import org.neo4j.values.result.QueryResult;
+import org.neo4j.values.virtual.MapValue;
 
 public class BoltResponseMessageRecorder extends MessageRecorder<ResponseMessage> implements BoltResponseMessageHandler<RuntimeException>
 {
     @Override
-    public void onSuccess( Map<String, Object> metadata )
+    public void onSuccess( MapValue metadata )
     {
         messages.add( new SuccessMessage( metadata ) );
     }
diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/BoltResponseMessageTest.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/BoltResponseMessageTest.java
index 81c61f49ca9f3..007cd26bdc2a3 100644
--- a/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/BoltResponseMessageTest.java
+++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/BoltResponseMessageTest.java
@@ -25,10 +25,7 @@
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
 
-import org.neo4j.bolt.v1.messaging.infrastructure.ValueNode;
-import org.neo4j.bolt.v1.messaging.infrastructure.ValueRelationship;
 import org.neo4j.bolt.v1.messaging.message.FailureMessage;
 import org.neo4j.bolt.v1.messaging.message.IgnoredMessage;
 import org.neo4j.bolt.v1.messaging.message.RecordMessage;
@@ -36,10 +33,13 @@
 import org.neo4j.bolt.v1.messaging.message.SuccessMessage;
 import org.neo4j.bolt.v1.packstream.BufferedChannelInput;
 import org.neo4j.bolt.v1.packstream.BufferedChannelOutput;
-import org.neo4j.graphdb.RelationshipType;
 import org.neo4j.kernel.api.exceptions.Status;
 import org.neo4j.kernel.impl.util.HexPrinter;
+import org.neo4j.values.AnyValue;
 import org.neo4j.values.AnyValues;
+import org.neo4j.values.virtual.EdgeValue;
+import org.neo4j.values.virtual.NodeValue;
+import org.neo4j.values.virtual.VirtualValues;
 
 import static java.lang.System.lineSeparator;
 import static java.util.Arrays.asList;
@@ -57,10 +57,13 @@
         .PATH_WITH_RELATIONSHIP_TRAVERSED_MULTIPLE_TIMES_IN_SAME_DIRECTION;
 import static org.neo4j.bolt.v1.messaging.util.MessageMatchers.serialize;
 import static org.neo4j.bolt.v1.runtime.spi.Records.record;
-import static org.neo4j.graphdb.Label.label;
 import static org.neo4j.helpers.collection.MapUtil.map;
+import static org.neo4j.values.storable.Values.intValue;
 import static org.neo4j.values.storable.Values.longValue;
+import static org.neo4j.values.storable.Values.stringArray;
 import static org.neo4j.values.storable.Values.stringValue;
+import static org.neo4j.values.virtual.VirtualValues.edgeValue;
+import static org.neo4j.values.virtual.VirtualValues.nodeValue;
 
 public class BoltResponseMessageTest
 {
@@ -71,7 +74,7 @@ public class BoltResponseMessageTest
     public void shouldHandleCommonMessages() throws Throwable
     {
         assertSerializes( new RecordMessage( record( longValue( 1L ), stringValue( "b" ), longValue( 2L ) ) ) );
-        assertSerializes( new SuccessMessage( new HashMap<>() ) );
+        assertSerializes( new SuccessMessage( VirtualValues.EMPTY_MAP ) );
         assertSerializes( new FailureMessage( Status.General.UnknownError, "Err" ) );
         assertSerializes( new IgnoredMessage() );
     }
@@ -113,10 +116,10 @@ public void shouldSerializeBasicTypes() throws Throwable
     @Test
     public void shouldSerializeNode() throws Throwable
     {
-        ValueNode valueNode = new ValueNode( 12L, asList( label( "User" ), label( "Banana" ) ),
-                map( "name", "Bob", "age", 14 ) );
-
-        assertThat( serialized( valueNode ),
+        NodeValue nodeValue = nodeValue( 12L, stringArray( "User", "Banana" ), VirtualValues
+                .map( new String[]{"name", "age"},
+                        new AnyValue[]{stringValue( "Bob" ), intValue( 14 )} ) );
+        assertThat( serialized( nodeValue ),
                 equalTo( "B1 71 91 B3 4E 0C 92 84 55 73 65 72 86 42 61 6E" + lineSeparator() +
                          "61 6E 61 A2 84 6E 61 6D 65 83 42 6F 62 83 61 67" + lineSeparator() +
                          "65 0E" ) );
@@ -125,10 +128,12 @@ public void shouldSerializeNode() throws Throwable
     @Test
     public void shouldSerializeRelationship() throws Throwable
     {
-        ValueRelationship valueRelationship = new ValueRelationship( 12L, 1L, 2L, RelationshipType.withName( "KNOWS" ),
-                map( "name", "Bob", "age", 14 ) );
-
-        assertThat( serialized( valueRelationship ),
+        EdgeValue edgeValue = edgeValue( 12L,
+                nodeValue( 1L, stringArray(), VirtualValues.EMPTY_MAP ),
+                nodeValue( 2L, stringArray(), VirtualValues.EMPTY_MAP ),
+                stringValue( "KNOWS" ), VirtualValues.map( new String[]{"name", "age"},
+                        new AnyValue[]{stringValue( "Bob" ), intValue( 14 )} ) );
+        assertThat( serialized( edgeValue ),
                 equalTo( "B1 71 91 B5 52 0C 01 02 85 4B 4E 4F 57 53 A2 84" + lineSeparator() +
                          "6E 61 6D 65 83 42 6F 62 83 61 67 65 0E" ) );
     }
@@ -206,10 +211,10 @@ public void shouldSerializePaths() throws Throwable
                          "01 02 01" ) );
     }
 
-    private String serialized( Object object ) throws IOException
+    private String serialized( AnyValue object ) throws IOException
     {
         RecordMessage message =
-                new RecordMessage( record( AnyValues.of( object ) ) );
+                new RecordMessage( record( object ) );
         return HexPrinter.hex( serialize( message ), 4, " " );
     }
 
diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/MessageProcessingHandlerTest.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/MessageProcessingHandlerTest.java
index 6203d2356f7b7..57e48a8577350 100644
--- a/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/MessageProcessingHandlerTest.java
+++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/MessageProcessingHandlerTest.java
@@ -29,12 +29,12 @@
 import org.neo4j.kernel.api.exceptions.Status;
 import org.neo4j.logging.AssertableLogProvider;
 import org.neo4j.logging.Log;
+import org.neo4j.values.virtual.MapValue;
 
 import static org.hamcrest.Matchers.both;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.startsWith;
 import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyMapOf;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
@@ -51,7 +51,7 @@ public void shouldCallHaltOnUnexpectedFailures() throws Exception
         BoltResponseMessageHandler<IOException> msgHandler = newResponseHandlerMock();
         doThrow( new RuntimeException( "Something went horribly wrong" ) )
                 .when( msgHandler )
-                .onSuccess( anyMapOf( String.class, Object.class ) );
+                .onSuccess( any( MapValue.class ) );
 
         BoltWorker worker = mock( BoltWorker.class );
         MessageProcessingHandler handler =
diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/Neo4jPackTest.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/Neo4jPackTest.java
index edfee866b715b..8996681b84fbb 100644
--- a/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/Neo4jPackTest.java
+++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/Neo4jPackTest.java
@@ -32,26 +32,33 @@
 import org.neo4j.bolt.v1.packstream.PackedInputArray;
 import org.neo4j.bolt.v1.packstream.PackedOutputArray;
 import org.neo4j.bolt.v1.runtime.Neo4jError;
-import org.neo4j.graphdb.Label;
-import org.neo4j.graphdb.Path;
 import org.neo4j.kernel.api.exceptions.Status;
+import org.neo4j.values.AnyValue;
+import org.neo4j.values.AnyValues;
+import org.neo4j.values.storable.TextArray;
+import org.neo4j.values.storable.TextValue;
+import org.neo4j.values.storable.Values;
+import org.neo4j.values.virtual.ListValue;
+import org.neo4j.values.virtual.MapValue;
+import org.neo4j.values.virtual.PathValue;
+import org.neo4j.values.virtual.VirtualValues;
 
-import static java.util.Arrays.asList;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.neo4j.bolt.v1.messaging.example.Edges.ALICE_KNOWS_BOB;
 import static org.neo4j.bolt.v1.messaging.example.Nodes.ALICE;
 import static org.neo4j.bolt.v1.messaging.example.Paths.ALL_PATHS;
-import static org.neo4j.bolt.v1.messaging.example.Relationships.ALICE_KNOWS_BOB;
-import static org.neo4j.helpers.collection.MapUtil.map;
+import static org.neo4j.values.storable.Values.charValue;
+import static org.neo4j.values.storable.Values.longValue;
+import static org.neo4j.values.storable.Values.stringValue;
 
 public class Neo4jPackTest
 {
     @Rule
     public ExpectedException exception = ExpectedException.none();
 
-    private byte[] packed( Object object ) throws IOException
+    private byte[] packed( AnyValue object ) throws IOException
     {
         PackedOutputArray output = new PackedOutputArray();
         Neo4jPack.Packer packer = new Neo4jPack.Packer( output );
@@ -59,7 +66,7 @@ private byte[] packed( Object object ) throws IOException
         return output.bytes();
     }
 
-    private Object unpacked( byte[] bytes ) throws IOException
+    private AnyValue unpacked( byte[] bytes ) throws IOException
     {
         PackedInputArray input = new PackedInputArray( bytes );
         Neo4jPack.Unpacker unpacker = new Neo4jPack.Unpacker( input );
@@ -75,19 +82,20 @@ public void shouldBeAbleToPackAndUnpackListStream() throws IOException
         Neo4jPack.Packer packer = new Neo4jPack.Packer( output );
         packer.packListStreamHeader();
         List<String> expected = new ArrayList<>();
-        for ( Label label : ALICE.getLabels() )
+        TextArray labels = ALICE.labels();
+        for ( int i = 0; i < labels.length(); i++ )
         {
-            String labelName = label.name();
+            String labelName = labels.stringValue( i );
             packer.pack( labelName );
             expected.add( labelName );
         }
         packer.packEndOfStream();
-        Object unpacked = unpacked( output.bytes() );
+        AnyValue unpacked = unpacked( output.bytes() );
 
         // Then
-        assertThat( unpacked, instanceOf( List.class ) );
-        List<String> unpackedList = (List<String>) unpacked;
-        assertThat( unpackedList, equalTo( expected ) );
+        assertThat( unpacked, instanceOf( ListValue.class ) );
+        ListValue unpackedList = (ListValue) unpacked;
+        assertThat( unpackedList, equalTo( AnyValues.asListValue( expected ) ) );
     }
 
     @SuppressWarnings( "unchecked" )
@@ -98,18 +106,25 @@ public void shouldBeAbleToPackAndUnpackMapStream() throws IOException
         PackedOutputArray output = new PackedOutputArray();
         Neo4jPack.Packer packer = new Neo4jPack.Packer( output );
         packer.packMapStreamHeader();
-        for ( Map.Entry<String,Object> entry : ALICE.getAllProperties().entrySet() )
+        ALICE.properties().foreach( ( s, value ) ->
         {
-            packer.pack( entry.getKey() );
-            packer.pack( entry.getValue() );
-        }
+            try
+            {
+                packer.pack( s );
+                packer.pack( value );
+            }
+            catch ( IOException e )
+            {
+                e.printStackTrace();
+            }
+        } );
         packer.packEndOfStream();
-        Object unpacked = unpacked( output.bytes() );
+        AnyValue unpacked = unpacked( output.bytes() );
 
         // Then
-        assertThat( unpacked, instanceOf( Map.class ) );
-        Map<String,Object> unpackedMap = (Map<String,Object>) unpacked;
-        assertThat( unpackedMap, equalTo( ALICE.getAllProperties() ) );
+        assertThat( unpacked, instanceOf( MapValue.class ) );
+        MapValue unpackedMap = (MapValue) unpacked;
+        assertThat( unpackedMap, equalTo( ALICE.properties() ) );
     }
 
     @SuppressWarnings( "unchecked" )
@@ -121,10 +136,10 @@ public void shouldFailWhenTryingToPackAndUnpackMapStreamContainingNullKeys() thr
         Neo4jPack.Packer packer = new Neo4jPack.Packer( output );
         packer.packMapStreamHeader();
 
-        HashMap<String,Object> map = new HashMap<>();
-        map.put(null, 42L);
-        map.put("foo", 1337L);
-        for ( Map.Entry<String,Object> entry : map.entrySet() )
+        HashMap<String,AnyValue> map = new HashMap<>();
+        map.put( null, longValue( 42L ) );
+        map.put( "foo", longValue( 1337L ) );
+        for ( Map.Entry<String,AnyValue> entry : map.entrySet() )
         {
             packer.pack( entry.getKey() );
             packer.pack( entry.getValue() );
@@ -137,26 +152,9 @@ public void shouldFailWhenTryingToPackAndUnpackMapStreamContainingNullKeys() thr
         unpacker.unpack();
 
         // Then
-        assertThat(unpacker.consumeError().get(), equalTo(
+        assertThat( unpacker.consumeError().get(), equalTo(
                 Neo4jError.from( Status.Request.Invalid,
-                        "Value `null` is not supported as key in maps, must be a non-nullable string." )));
-    }
-
-    @SuppressWarnings( "unchecked" )
-    @Test
-    public void shouldFailNicelyWhenPackingAMapWithUnpackableValues() throws IOException
-    {
-        // Given
-        PackedOutputArray output = new PackedOutputArray();
-        Neo4jPack.Packer packer = new Neo4jPack.Packer( output );
-        packer.packRawMap( map( "unpackable", new Unpackable() ) );
-        Object unpacked = unpacked( output.bytes() );
-
-        // Then
-        assertThat( unpacked, instanceOf( Map.class ) );
-        Map<String,Object> unpackedMap = (Map<String,Object>) unpacked;
-        assertThat( unpackedMap, equalTo( map( "unpackable", null ) ) );
-        assertTrue( packer.hasErrors() );
+                        "Value `null` is not supported as key in maps, must be a non-nullable string." ) ) );
     }
 
     @Test
@@ -177,7 +175,8 @@ public void shouldErrorOnUnpackingMapWithDuplicateKeys() throws IOException
         unpacker.unpack();
 
         // Then
-        assertThat(unpacker.consumeError().get(), equalTo( Neo4jError.from( Status.Request.Invalid, "Duplicate map key `key`." ) ));
+        assertThat( unpacker.consumeError().get(),
+                equalTo( Neo4jError.from( Status.Request.Invalid, "Duplicate map key `key`." ) ) );
     }
 
     @Test
@@ -201,7 +200,7 @@ public void shouldNotBeAbleToUnpackRelationship() throws IOException
     @Test
     public void shouldNotBeAbleToUnpackPaths() throws IOException
     {
-        for ( Path path : ALL_PATHS )
+        for ( PathValue path : ALL_PATHS )
         {
             // Expect
             exception.expect( BoltIOException.class );
@@ -216,12 +215,12 @@ public void shouldTreatSingleCharAsSingleCharacterString() throws IOException
         // Given
         PackedOutputArray output = new PackedOutputArray();
         Neo4jPack.Packer packer = new Neo4jPack.Packer( output );
-        packer.pack( 'C' );
-        Object unpacked = unpacked( output.bytes() );
+        packer.pack( charValue( 'C' ) );
+        AnyValue unpacked = unpacked( output.bytes() );
 
         // Then
-        assertThat( unpacked, instanceOf( String.class ) );
-        assertThat( unpacked, equalTo( "C" ) );
+        assertThat( unpacked, instanceOf( TextValue.class ) );
+        assertThat( unpacked, equalTo( stringValue( "C" ) ) );
     }
 
     @Test
@@ -230,12 +229,13 @@ public void shouldTreatCharArrayAsListOfStrings() throws IOException
         // Given
         PackedOutputArray output = new PackedOutputArray();
         Neo4jPack.Packer packer = new Neo4jPack.Packer( output );
-        packer.pack( new char[]{'W', 'H', 'Y'} );
+        packer.pack( Values.charArray( new char[]{'W', 'H', 'Y'} ) );
         Object unpacked = unpacked( output.bytes() );
 
         // Then
-        assertThat( unpacked, instanceOf( List.class ) );
-        assertThat( unpacked, equalTo( asList( "W", "H", "Y" ) ) );
+        assertThat( unpacked, instanceOf( ListValue.class ) );
+        assertThat( unpacked,
+                equalTo( VirtualValues.list( stringValue( "W" ), stringValue( "H" ), stringValue( "Y" ) ) ) );
     }
 
     private static class Unpackable
diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/example/Edges.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/example/Edges.java
new file mode 100644
index 0000000000000..97c68c27c00d0
--- /dev/null
+++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/example/Edges.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2002-2017 "Neo Technology,"
+ * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Neo4j is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.neo4j.bolt.v1.messaging.example;
+
+import org.neo4j.values.AnyValue;
+import org.neo4j.values.storable.TextValue;
+import org.neo4j.values.virtual.EdgeValue;
+
+import static org.neo4j.bolt.v1.messaging.example.Nodes.ALICE;
+import static org.neo4j.bolt.v1.messaging.example.Nodes.BOB;
+import static org.neo4j.bolt.v1.messaging.example.Nodes.CAROL;
+import static org.neo4j.bolt.v1.messaging.example.Nodes.DAVE;
+import static org.neo4j.bolt.v1.messaging.example.Support.NO_PROPERTIES;
+import static org.neo4j.values.storable.Values.longValue;
+import static org.neo4j.values.storable.Values.stringValue;
+import static org.neo4j.values.virtual.VirtualValues.edgeValue;
+import static org.neo4j.values.virtual.VirtualValues.map;
+
+public class Edges
+{
+    // Relationship types
+    public static final TextValue KNOWS = stringValue( "KNOWS" );
+    public static final TextValue LIKES = stringValue( "LIKES" );
+    public static final TextValue DISLIKES = stringValue( "DISLIKES" );
+    public static final TextValue MARRIED_TO = stringValue( "MARRIED_TO" );
+    public static final TextValue WORKS_FOR = stringValue( "WORKS_FOR" );
+
+    // Edges
+    public static final EdgeValue ALICE_KNOWS_BOB =
+            edgeValue( 12L, ALICE, BOB, KNOWS,
+                    map( new String[]{"since"}, new AnyValue[]{longValue( 1999L )} ) );
+    public static final EdgeValue ALICE_LIKES_CAROL = edgeValue( 13L, ALICE, CAROL, LIKES, NO_PROPERTIES );
+    public static final EdgeValue CAROL_DISLIKES_BOB = edgeValue( 32L, CAROL, BOB, DISLIKES, NO_PROPERTIES );
+    public static final EdgeValue CAROL_MARRIED_TO_DAVE = edgeValue( 34L, CAROL, DAVE, MARRIED_TO, NO_PROPERTIES );
+    public static final EdgeValue DAVE_WORKS_FOR_DAVE = edgeValue( 44L, DAVE, DAVE, WORKS_FOR, NO_PROPERTIES );
+
+    private Edges()
+    {
+    }
+}
diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/example/Nodes.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/example/Nodes.java
index b853561ee6fd4..a27a1c733c034 100644
--- a/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/example/Nodes.java
+++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/example/Nodes.java
@@ -19,34 +19,37 @@
  */
 package org.neo4j.bolt.v1.messaging.example;
 
-import java.util.Collections;
+import org.neo4j.values.AnyValue;
+import org.neo4j.values.storable.Values;
+import org.neo4j.values.virtual.NodeValue;
+import org.neo4j.values.virtual.VirtualValues;
 
-import org.neo4j.bolt.v1.messaging.infrastructure.ValueNode;
-import org.neo4j.graphdb.Node;
-
-import static java.util.Arrays.asList;
-import static org.neo4j.bolt.v1.messaging.example.Support.NO_LABELS;
-import static org.neo4j.graphdb.Label.label;
-import static org.neo4j.helpers.collection.MapUtil.map;
+import static org.neo4j.values.storable.Values.stringArray;
+import static org.neo4j.values.storable.Values.stringValue;
+import static org.neo4j.values.virtual.VirtualValues.nodeValue;
 
 public class Nodes
 {
-    public static final Node ALICE = new ValueNode(
+    public static final NodeValue ALICE = nodeValue(
             1001L,
-            asList( label( "Person" ), label( "Employee" ) ),
-            map( "name", "Alice", "age", 33L ) );
-    public static final Node BOB = new ValueNode(
+            stringArray( "Person", "Employee" ),
+            VirtualValues.map( new String[]{"name", "age"},
+                    new AnyValue[]{stringValue( "Alice" ), Values.longValue( 33L )} ) );
+    public static final NodeValue BOB = nodeValue(
             1002L,
-            asList( label( "Person" ), label( "Employee" ) ),
-            map( "name", "Bob", "age", 44L ) );
-    public static final Node CAROL = new ValueNode(
+            stringArray( "Person", "Employee" ),
+            VirtualValues.map( new String[]{"name", "age"},
+                    new AnyValue[]{stringValue( "Bob" ), Values.longValue( 44L )} ) );
+    public static final NodeValue CAROL = nodeValue(
             1003L,
-            Collections.singletonList( label( "Person" ) ),
-            map( "name", "Carol" ) );
-    public static final Node DAVE = new ValueNode(
+            stringArray( "Person" ),
+            VirtualValues.map( new String[]{"name"},
+                    new AnyValue[]{stringValue( "Carol" )} ) );
+    public static final NodeValue DAVE = nodeValue(
             1004L,
-            NO_LABELS,
-            map( "name", "Dave" ) );
+            stringArray(),
+            VirtualValues.map( new String[]{"name"},
+                    new AnyValue[]{stringValue( "Dave" )} ) );
 
     private Nodes()
     {
diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/example/Paths.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/example/Paths.java
index 43cbe94c831fb..c4ff910c96db9 100644
--- a/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/example/Paths.java
+++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/example/Paths.java
@@ -19,21 +19,20 @@
  */
 package org.neo4j.bolt.v1.messaging.example;
 
-import org.neo4j.bolt.v1.messaging.infrastructure.ValuePath;
-import org.neo4j.graphdb.Path;
+import org.neo4j.values.virtual.PathValue;
 
+import static org.neo4j.bolt.v1.messaging.example.Edges.ALICE_KNOWS_BOB;
+import static org.neo4j.bolt.v1.messaging.example.Edges.ALICE_LIKES_CAROL;
+import static org.neo4j.bolt.v1.messaging.example.Edges.CAROL_DISLIKES_BOB;
+import static org.neo4j.bolt.v1.messaging.example.Edges.CAROL_MARRIED_TO_DAVE;
+import static org.neo4j.bolt.v1.messaging.example.Edges.DAVE_WORKS_FOR_DAVE;
 import static org.neo4j.bolt.v1.messaging.example.Nodes.ALICE;
 import static org.neo4j.bolt.v1.messaging.example.Nodes.BOB;
 import static org.neo4j.bolt.v1.messaging.example.Nodes.CAROL;
 import static org.neo4j.bolt.v1.messaging.example.Nodes.DAVE;
-import static org.neo4j.bolt.v1.messaging.example.Relationships.ALICE_KNOWS_BOB;
-import static org.neo4j.bolt.v1.messaging.example.Relationships.ALICE_LIKES_CAROL;
-import static org.neo4j.bolt.v1.messaging.example.Relationships.CAROL_DISLIKES_BOB;
-import static org.neo4j.bolt.v1.messaging.example.Relationships.CAROL_MARRIED_TO_DAVE;
-import static org.neo4j.bolt.v1.messaging.example.Relationships.DAVE_WORKS_FOR_DAVE;
+import static org.neo4j.bolt.v1.messaging.example.Support.edges;
 import static org.neo4j.bolt.v1.messaging.example.Support.nodes;
-import static org.neo4j.bolt.v1.messaging.example.Support.relationships;
-import static org.neo4j.bolt.v1.messaging.example.Support.sequence;
+import static org.neo4j.values.virtual.VirtualValues.path;
 
 /*
  * This class contains a number of paths used for testing, all based on
@@ -56,46 +55,37 @@
 public class Paths
 {
     // Paths
-    public static final Path PATH_WITH_LENGTH_ZERO =
-            new ValuePath( // A
-                    nodes( ALICE ),
-                    relationships(),
-                    sequence( /* 0 */ ) );
-    public static final Path PATH_WITH_LENGTH_ONE =
-            new ValuePath( // A->B
+    public static final PathValue PATH_WITH_LENGTH_ZERO = path( nodes( ALICE ), edges() );
+
+    public static final PathValue PATH_WITH_LENGTH_ONE =
+            path( // A->B
                     nodes( ALICE, BOB ),
-                    relationships( ALICE_KNOWS_BOB ),
-                    sequence( /* 0 */ +1, 1 ) );
-    public static final Path PATH_WITH_LENGTH_TWO =
-            new ValuePath( // A->C->D
+                    edges( ALICE_KNOWS_BOB ) );
+    public static final PathValue PATH_WITH_LENGTH_TWO =
+            path( // A->C->D
                     nodes( ALICE, CAROL, DAVE ),
-                    relationships( ALICE_LIKES_CAROL,
-                            CAROL_MARRIED_TO_DAVE ),
-                    sequence( /* 0 */ +1, 1, +2, 2 ) );
-    public static final Path PATH_WITH_RELATIONSHIP_TRAVERSED_AGAINST_ITS_DIRECTION =
-            new ValuePath( // A->B<-C->D
-                    nodes( ALICE, BOB, CAROL, DAVE ),
-                    relationships( ALICE_KNOWS_BOB, CAROL_DISLIKES_BOB, CAROL_MARRIED_TO_DAVE ),
-                    sequence( /* 0 */ +1, 1, -2, 2, +3, 3 ) );
-    public static final Path PATH_WITH_NODES_VISITED_MULTIPLE_TIMES =
-            new ValuePath( // A->B<-A->C->B<-C
-                    nodes( ALICE, BOB, CAROL ),
-                    relationships( ALICE_KNOWS_BOB, ALICE_LIKES_CAROL,
-                            CAROL_DISLIKES_BOB ),
-                    sequence( /* 0 */ +1, 1, -1, 0, +2, 2, +3, 1, -3, 2 ) );
-    public static final Path PATH_WITH_RELATIONSHIP_TRAVERSED_MULTIPLE_TIMES_IN_SAME_DIRECTION =
-            new ValuePath( // A->C->B<-A->C->D
+                    edges( ALICE_LIKES_CAROL,
+                            CAROL_MARRIED_TO_DAVE ) );
+    public static final PathValue PATH_WITH_RELATIONSHIP_TRAVERSED_AGAINST_ITS_DIRECTION =
+            path( // A->B<-C->D
                     nodes( ALICE, BOB, CAROL, DAVE ),
-                    relationships( ALICE_LIKES_CAROL, CAROL_DISLIKES_BOB, ALICE_KNOWS_BOB,
-                            CAROL_MARRIED_TO_DAVE ),
-                    sequence( /* 0 */ +1, 2, +2, 1, -3, 0, +1, 2, +4, 3 ) );
-    public static final Path PATH_WITH_LOOP =
-            new ValuePath( // C->D->D
-                    nodes( CAROL, DAVE ),
-                    relationships( CAROL_MARRIED_TO_DAVE, DAVE_WORKS_FOR_DAVE ),
-                    sequence( /* 0 */ +1, 1, +2, 1 ) );
+                    edges( ALICE_KNOWS_BOB, CAROL_DISLIKES_BOB, CAROL_MARRIED_TO_DAVE ) );
+    public static final PathValue PATH_WITH_NODES_VISITED_MULTIPLE_TIMES =
+            path( // A->B<-A->C->B<-C
+                    nodes( ALICE, BOB, ALICE, CAROL, BOB, CAROL),
+                    edges( ALICE_KNOWS_BOB, ALICE_KNOWS_BOB, ALICE_LIKES_CAROL,
+                            CAROL_DISLIKES_BOB, CAROL_DISLIKES_BOB ) );
+    public static final PathValue PATH_WITH_RELATIONSHIP_TRAVERSED_MULTIPLE_TIMES_IN_SAME_DIRECTION =
+            path( // A->C->B<-A->C->D
+                    nodes( ALICE, CAROL, BOB, ALICE, CAROL, DAVE ),
+                    edges( ALICE_LIKES_CAROL, CAROL_DISLIKES_BOB, ALICE_KNOWS_BOB,ALICE_LIKES_CAROL,
+                            CAROL_MARRIED_TO_DAVE ) );
+    public static final PathValue PATH_WITH_LOOP =
+            path( // C->D->D
+                    nodes( CAROL, DAVE, DAVE ),
+                    edges( CAROL_MARRIED_TO_DAVE, DAVE_WORKS_FOR_DAVE ) );
 
-    public static final Path[] ALL_PATHS = new Path[] {
+    public static final PathValue[] ALL_PATHS = new PathValue[]{
             PATH_WITH_LENGTH_ZERO,
             PATH_WITH_LENGTH_ONE,
             PATH_WITH_LENGTH_TWO,
diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/example/Relationships.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/example/Relationships.java
deleted file mode 100644
index 14bad176b2180..0000000000000
--- a/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/example/Relationships.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2002-2017 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
- *
- * This file is part of Neo4j.
- *
- * Neo4j is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.neo4j.bolt.v1.messaging.example;
-
-import org.neo4j.bolt.v1.messaging.infrastructure.ValueRelationship;
-import org.neo4j.graphdb.Relationship;
-import org.neo4j.graphdb.RelationshipType;
-
-import static org.neo4j.bolt.v1.messaging.example.Nodes.ALICE;
-import static org.neo4j.bolt.v1.messaging.example.Nodes.BOB;
-import static org.neo4j.bolt.v1.messaging.example.Nodes.CAROL;
-import static org.neo4j.bolt.v1.messaging.example.Nodes.DAVE;
-import static org.neo4j.bolt.v1.messaging.example.Support.NO_PROPERTIES;
-import static org.neo4j.helpers.collection.MapUtil.map;
-
-public class Relationships
-{
-    // Relationship types
-    public static final RelationshipType KNOWS = RelationshipType.withName( "KNOWS" );
-    public static final RelationshipType LIKES = RelationshipType.withName( "LIKES" );
-    public static final RelationshipType DISLIKES = RelationshipType.withName( "DISLIKES" );
-    public static final RelationshipType MARRIED_TO =
-            RelationshipType.withName( "MARRIED_TO" );
-    public static final RelationshipType WORKS_FOR =
-            RelationshipType.withName( "WORKS_FOR" );
-
-    // Relationships
-    public static final Relationship ALICE_KNOWS_BOB =
-            new ValueRelationship( 12L, ALICE.getId(), BOB.getId(), KNOWS,
-                    map( "since", 1999L ) );
-    public static final Relationship ALICE_LIKES_CAROL =
-            new ValueRelationship( 13L, ALICE.getId(), CAROL.getId(), LIKES,
-                    NO_PROPERTIES );
-    public static final Relationship CAROL_DISLIKES_BOB =
-            new ValueRelationship( 32L, CAROL.getId(), BOB.getId(), DISLIKES,
-                    NO_PROPERTIES );
-    public static final Relationship CAROL_MARRIED_TO_DAVE =
-            new ValueRelationship( 34L, CAROL.getId(), DAVE.getId(), MARRIED_TO,
-                    NO_PROPERTIES );
-    public static final Relationship DAVE_WORKS_FOR_DAVE =
-            new ValueRelationship( 44L, DAVE.getId(), DAVE.getId(), WORKS_FOR,
-                    NO_PROPERTIES );
-
-    private Relationships()
-    {
-    }
-}
diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/example/Support.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/example/Support.java
index 711b0bdbb2441..a61d4e5fed0a7 100644
--- a/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/example/Support.java
+++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/example/Support.java
@@ -19,77 +19,41 @@
  */
 package org.neo4j.bolt.v1.messaging.example;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
+import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 
-import org.neo4j.graphdb.Label;
-import org.neo4j.graphdb.Node;
-import org.neo4j.graphdb.Path;
-import org.neo4j.graphdb.Relationship;
-
-import static java.util.Arrays.asList;
+import org.neo4j.values.storable.TextArray;
+import org.neo4j.values.storable.Values;
+import org.neo4j.values.virtual.EdgeValue;
+import org.neo4j.values.virtual.MapValue;
+import org.neo4j.values.virtual.NodeValue;
+import org.neo4j.values.virtual.PathValue;
+import org.neo4j.values.virtual.VirtualValues;
 
 public class Support
 {
-    public static final List<Label> NO_LABELS = new ArrayList<>();
-    public static final Map<String, Object> NO_PROPERTIES = new HashMap<>();
+    static final TextArray NO_LABELS = Values.stringArray();
+    static final MapValue NO_PROPERTIES = VirtualValues.EMPTY_MAP;
 
     private Support()
     {
     }
 
-    // Collect labels from a Node
-    public static Collection<Label> labels( Node node )
-    {
-        List<Label> labels = new ArrayList<>();
-        for ( Label label : node.getLabels() )
-        {
-            labels.add( label );
-        }
-        return labels;
-    }
-
     // Helper to produce literal list of nodes
-    public static List<Node> nodes( Node... nodes )
+    public static NodeValue[] nodes( NodeValue... nodes )
     {
-        return new ArrayList<>( asList( nodes ) );
+        return nodes;
     }
 
     // Helper to extract list of nodes from a path
-    public static List<Node> nodes( Path path )
+    public static List<NodeValue> nodes( PathValue path )
     {
-        List<Node> nodes = new ArrayList<>( path.length() + 1 );
-        for ( Node node : path.nodes() )
-        {
-            nodes.add( node );
-        }
-        return nodes;
+        return Arrays.asList( path.nodes() );
     }
 
     // Helper to produce literal list of relationships
-    public static List<Relationship> relationships( Relationship... relationships )
+    public static EdgeValue[] edges( EdgeValue... edgeValues )
     {
-        return new ArrayList<>( asList( relationships ) );
+        return edgeValues;
     }
-
-    // Helper to extract list of relationships from a path
-    public static List<Relationship> relationships( Path path )
-    {
-        List<Relationship> relationships = new ArrayList<>( path.length() );
-        for ( Relationship relationship : path.relationships() )
-        {
-            relationships.add( relationship );
-        }
-        return relationships;
-    }
-
-    // Helper to produce literal list of integers, used for path sequence information
-    public static List<Integer> sequence( Integer... integers )
-    {
-        return new ArrayList<>( asList( integers ) );
-    }
-
 }
diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/infrastructure/ValuePathTest.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/infrastructure/ValuePathTest.java
deleted file mode 100644
index a77e7844879cc..0000000000000
--- a/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/infrastructure/ValuePathTest.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (c) 2002-2017 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
- *
- * This file is part of Neo4j.
- *
- * Neo4j is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.neo4j.bolt.v1.messaging.infrastructure;
-
-import org.junit.Test;
-
-import org.neo4j.graphdb.Path;
-
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import static org.neo4j.bolt.v1.messaging.example.Support.nodes;
-import static org.neo4j.bolt.v1.messaging.example.Support.relationships;
-import static org.neo4j.bolt.v1.messaging.example.Nodes.ALICE;
-import static org.neo4j.bolt.v1.messaging.example.Nodes.BOB;
-import static org.neo4j.bolt.v1.messaging.example.Nodes.CAROL;
-import static org.neo4j.bolt.v1.messaging.example.Nodes.DAVE;
-import static org.neo4j.bolt.v1.messaging.example.Paths.PATH_WITH_LENGTH_ONE;
-import static org.neo4j.bolt.v1.messaging.example.Paths.PATH_WITH_LENGTH_TWO;
-import static org.neo4j.bolt.v1.messaging.example.Paths.PATH_WITH_LENGTH_ZERO;
-import static org.neo4j.bolt.v1.messaging.example.Paths.PATH_WITH_LOOP;
-import static org.neo4j.bolt.v1.messaging.example.Paths.PATH_WITH_NODES_VISITED_MULTIPLE_TIMES;
-import static org.neo4j.bolt.v1.messaging.example.Paths
-        .PATH_WITH_RELATIONSHIP_TRAVERSED_AGAINST_ITS_DIRECTION;
-import static org.neo4j.bolt.v1.messaging.example.Paths
-        .PATH_WITH_RELATIONSHIP_TRAVERSED_MULTIPLE_TIMES_IN_SAME_DIRECTION;
-import static org.neo4j.bolt.v1.messaging.example.Relationships.ALICE_KNOWS_BOB;
-import static org.neo4j.bolt.v1.messaging.example.Relationships.ALICE_LIKES_CAROL;
-import static org.neo4j.bolt.v1.messaging.example.Relationships.CAROL_DISLIKES_BOB;
-import static org.neo4j.bolt.v1.messaging.example.Relationships.CAROL_MARRIED_TO_DAVE;
-import static org.neo4j.bolt.v1.messaging.example.Relationships.DAVE_WORKS_FOR_DAVE;
-
-public class ValuePathTest
-{
-
-    @Test
-    public void canConstructPathWithLengthZero()
-    {
-        // Given A
-        Path path = PATH_WITH_LENGTH_ZERO;
-
-        // Then
-        assertThat( path.length(), equalTo( 0 ) );
-        assertThat( path.startNode(), equalTo( ALICE ) );
-        assertThat( path.endNode(), equalTo( ALICE ) );
-        assertThat( nodes( path ), equalTo( nodes( ALICE ) ) );
-        assertThat( path.lastRelationship(), nullValue() );
-        assertThat( relationships( path ), equalTo( relationships() ) );
-    }
-
-    @Test
-    public void canConstructPathWithLengthOne()
-    {
-        // Given A->B
-        Path path = PATH_WITH_LENGTH_ONE;
-
-        // Then
-        assertThat( path.length(), equalTo( 1 ) );
-        assertThat( path.startNode(), equalTo( ALICE ) );
-        assertThat( path.endNode(), equalTo( BOB ) );
-        assertThat( nodes( path ), equalTo( nodes( ALICE, BOB ) ) );
-        assertThat( path.lastRelationship(), equalTo( ALICE_KNOWS_BOB ) );
-        assertThat( relationships( path ), equalTo( relationships( ALICE_KNOWS_BOB ) ) );
-    }
-
-    @Test
-    public void canConstructPathWithLengthTwo()
-    {
-        // Given A->C->D
-        Path path = PATH_WITH_LENGTH_TWO;
-
-        // Then
-        assertThat( path.length(), equalTo( 2 ) );
-        assertThat( path.startNode(), equalTo( ALICE ) );
-        assertThat( path.endNode(), equalTo( DAVE ) );
-        assertThat( nodes( path ), equalTo( nodes( ALICE, CAROL, DAVE ) ) );
-        assertThat( path.lastRelationship(), equalTo( CAROL_MARRIED_TO_DAVE ) );
-        assertThat( relationships( path ), equalTo(
-                relationships( ALICE_LIKES_CAROL, CAROL_MARRIED_TO_DAVE ) ) );
-    }
-
-    @Test
-    public void canConstructPathWithRelationshipTraversedAgainstItsDirection()
-    {
-        // Given A->B<-C->D
-        Path path = PATH_WITH_RELATIONSHIP_TRAVERSED_AGAINST_ITS_DIRECTION;
-
-        // Then
-        assertThat( path.length(), equalTo( 3 ) );
-        assertThat( path.startNode(), equalTo( ALICE ) );
-        assertThat( path.endNode(), equalTo( DAVE ) );
-        assertThat( nodes( path ), equalTo( nodes( ALICE, BOB, CAROL, DAVE ) ) );
-        assertThat( path.lastRelationship(), equalTo( CAROL_MARRIED_TO_DAVE ) );
-        assertThat( relationships( path ), equalTo(
-                relationships( ALICE_KNOWS_BOB, CAROL_DISLIKES_BOB, CAROL_MARRIED_TO_DAVE ) ) );
-    }
-
-    @Test
-    public void canConstructPathWithNodesVisitedMultipleTimes()
-    {
-        // Given A->B<-A->C->B<-C
-        Path path = PATH_WITH_NODES_VISITED_MULTIPLE_TIMES;
-
-        // Then
-        assertThat( path.length(), equalTo( 5 ) );
-        assertThat( path.startNode(), equalTo( ALICE ) );
-        assertThat( path.endNode(), equalTo( CAROL ) );
-        assertThat( nodes( path ), equalTo( nodes( ALICE, BOB, ALICE, CAROL, BOB, CAROL ) ) );
-        assertThat( path.lastRelationship(), equalTo( CAROL_DISLIKES_BOB ) );
-        assertThat( relationships( path ), equalTo(
-                relationships( ALICE_KNOWS_BOB, ALICE_KNOWS_BOB, ALICE_LIKES_CAROL,
-                        CAROL_DISLIKES_BOB, CAROL_DISLIKES_BOB ) ) );
-    }
-
-    @Test
-    public void canConstructPathWithRelationshipTraversedMultipleTimesInSameDirection()
-    {
-        // Given A->C->B<-A->C->D
-        Path path = PATH_WITH_RELATIONSHIP_TRAVERSED_MULTIPLE_TIMES_IN_SAME_DIRECTION;
-
-        // Then
-        assertThat( path.length(), equalTo( 5 ) );
-        assertThat( path.startNode(), equalTo( ALICE ) );
-        assertThat( path.endNode(), equalTo( DAVE ) );
-        assertThat( nodes( path ), equalTo( nodes( ALICE, CAROL, BOB, ALICE, CAROL, DAVE ) ) );
-        assertThat( path.lastRelationship(), equalTo( CAROL_MARRIED_TO_DAVE ) );
-        assertThat( relationships( path ), equalTo(
-                relationships( ALICE_LIKES_CAROL, CAROL_DISLIKES_BOB, ALICE_KNOWS_BOB,
-                        ALICE_LIKES_CAROL, CAROL_MARRIED_TO_DAVE ) ) );
-    }
-
-    @Test
-    public void canConstructPathWithLoop()
-    {
-        // Given C->D->D
-        Path path = PATH_WITH_LOOP;
-
-        // Then
-        assertThat( path.length(), equalTo( 2 ) );
-        assertThat( path.startNode(), equalTo( CAROL ) );
-        assertThat( path.endNode(), equalTo( DAVE ) );
-        assertThat( nodes( path ), equalTo( nodes( CAROL, DAVE, DAVE ) ) );
-        assertThat( path.lastRelationship(), equalTo( DAVE_WORKS_FOR_DAVE ) );
-        assertThat( relationships( path ), equalTo(
-                relationships( CAROL_MARRIED_TO_DAVE, DAVE_WORKS_FOR_DAVE ) ) );
-    }
-
-}
diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/message/SuccessMessage.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/message/SuccessMessage.java
index d26122d8cc6ec..244cf7bed17d9 100644
--- a/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/message/SuccessMessage.java
+++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/message/SuccessMessage.java
@@ -20,14 +20,13 @@
 package org.neo4j.bolt.v1.messaging.message;
 
 import org.neo4j.bolt.v1.messaging.BoltResponseMessageHandler;
-
-import java.util.Map;
+import org.neo4j.values.virtual.MapValue;
 
 public class SuccessMessage implements ResponseMessage
 {
-    private final Map<String,Object> metadata;
+    private final MapValue metadata;
 
-    public SuccessMessage( Map<String,Object> metadata )
+    public SuccessMessage( MapValue metadata )
     {
         this.metadata = metadata;
     }
@@ -70,7 +69,7 @@ public String toString()
                '}';
     }
 
-    public Map<String,Object> meta()
+    public MapValue meta()
     {
         return metadata;
     }
diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/util/MessageMatchers.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/util/MessageMatchers.java
index 5afef4caddcb1..501e300bbb273 100644
--- a/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/util/MessageMatchers.java
+++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/util/MessageMatchers.java
@@ -26,6 +26,7 @@
 
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -48,14 +49,21 @@
 import org.neo4j.bolt.v1.packstream.BufferedChannelInput;
 import org.neo4j.bolt.v1.packstream.BufferedChannelOutput;
 import org.neo4j.bolt.v1.transport.integration.TestNotification;
+import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Notification;
+import org.neo4j.graphdb.Relationship;
+import org.neo4j.graphdb.spatial.Point;
 import org.neo4j.kernel.api.exceptions.Status;
 import org.neo4j.kernel.impl.util.HexPrinter;
+import org.neo4j.values.AnyValue;
+import org.neo4j.values.BaseToObjectValueWriter;
 import org.neo4j.values.result.QueryResult;
+import org.neo4j.values.virtual.MapValue;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
 import static org.neo4j.bolt.v1.messaging.BoltResponseMessageWriter.NO_BOUNDARY_HOOK;
 
@@ -65,6 +73,46 @@ private MessageMatchers()
     {
     }
 
+    private static Map<String,Object> toRawMap( MapValue mapValue )
+    {
+        Deserializer deserializer = new Deserializer();
+        HashMap<String,Object> map = new HashMap<>( mapValue.size() );
+        for ( Map.Entry<String,AnyValue> entry : mapValue.entrySet() )
+        {
+            entry.getValue().writeTo( deserializer );
+            map.put( entry.getKey(), deserializer.value() );
+        }
+        return map;
+    }
+
+    private static class Deserializer extends BaseToObjectValueWriter<RuntimeException>
+    {
+
+        @Override
+        protected Node newNodeProxyById( long id )
+        {
+            return null;
+        }
+
+        @Override
+        protected Relationship newRelationshipProxyById( long id )
+        {
+            return null;
+        }
+
+        @Override
+        protected Point newGeographicPoint( double longitude, double latitude, String name, int code, String href )
+        {
+            return null;
+        }
+
+        @Override
+        protected Point newCartesianPoint( double x, double y, String name, int code, String href )
+        {
+            return null;
+        }
+    }
+
     public static Matcher<List<ResponseMessage>> equalsMessages( final Matcher<ResponseMessage>... messageMatchers )
     {
         return new TypeSafeMatcher<List<ResponseMessage>>()
@@ -103,15 +151,16 @@ public static Matcher<ResponseMessage> hasNotification( Notification notificatio
             protected boolean matchesSafely( ResponseMessage t )
             {
                 assertThat( t, instanceOf( SuccessMessage.class ) );
-                Map<String,Object> meta = ((SuccessMessage) t).meta();
-                assertThat(meta, Matchers.hasKey("notifications"));
+                Map<String,Object> meta = toRawMap( ((SuccessMessage) t).meta() );
+
+                assertThat( meta.containsKey( "notifications" ), is( true ) );
                 Set<Notification> notifications =
-                        ((List<Map<String, Object>>)meta.get( "notifications" ))
+                        ((List<Map<String,Object>>) meta.get( "notifications" ))
                                 .stream()
                                 .map( TestNotification::fromMap )
                                 .collect( Collectors.toSet() );
 
-                assertThat( notifications, Matchers.contains( notification ));
+                assertThat( notifications, Matchers.contains( notification ) );
                 return true;
             }
 
@@ -151,7 +200,7 @@ public static Matcher<ResponseMessage> msgSuccess( final Matcher<Map<? extends S
             protected boolean matchesSafely( ResponseMessage t )
             {
                 assertThat( t, instanceOf( SuccessMessage.class ) );
-                assertThat( ((SuccessMessage) t).meta(), matcher );
+                assertThat( toRawMap( ((SuccessMessage) t).meta() ), matcher );
                 return true;
             }
 
@@ -324,7 +373,7 @@ public static ResponseMessage responseMessage( byte[] bytes ) throws IOException
     private static BoltRequestMessageReader requestReader( byte[] bytes )
     {
         return new BoltRequestMessageReader(
-                    new Neo4jPack.Unpacker( new BufferedChannelInput( 128 ).reset( new ArrayByteChannel( bytes ) ) ) );
+                new Neo4jPack.Unpacker( new BufferedChannelInput( 128 ).reset( new ArrayByteChannel( bytes ) ) ) );
     }
 
     private static BoltResponseMessageReader responseReader( byte[] bytes )
diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/CypherAdapterStreamTest.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/CypherAdapterStreamTest.java
index d0ec89d5cfb00..5d3d4161391b8 100644
--- a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/CypherAdapterStreamTest.java
+++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/CypherAdapterStreamTest.java
@@ -35,9 +35,12 @@
 import org.neo4j.graphdb.InputPosition;
 import org.neo4j.graphdb.QueryStatistics;
 import org.neo4j.graphdb.impl.notification.NotificationCode;
-import org.neo4j.helpers.collection.Iterators;
 import org.neo4j.kernel.impl.query.TransactionalContext;
+import org.neo4j.values.AnyValue;
 import org.neo4j.values.result.QueryResult;
+import org.neo4j.values.storable.DoubleValue;
+import org.neo4j.values.virtual.MapValue;
+import org.neo4j.values.virtual.VirtualValues;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
@@ -50,7 +53,13 @@
 import static org.neo4j.graphdb.QueryExecutionType.QueryType.READ_WRITE;
 import static org.neo4j.graphdb.QueryExecutionType.explained;
 import static org.neo4j.graphdb.QueryExecutionType.query;
+import static org.neo4j.helpers.collection.MapUtil.genericMap;
 import static org.neo4j.helpers.collection.MapUtil.map;
+import static org.neo4j.values.storable.Values.doubleValue;
+import static org.neo4j.values.storable.Values.intValue;
+import static org.neo4j.values.storable.Values.longValue;
+import static org.neo4j.values.storable.Values.stringValue;
+import static org.neo4j.values.virtual.VirtualValues.list;
 
 public class CypherAdapterStreamTest
 {
@@ -73,7 +82,7 @@ public void shouldIncludeBasicMetadata() throws Throwable
         when( queryStatistics.getLabelsRemoved() ).thenReturn( 11 );
 
         QueryResult result = mock( QueryResult.class );
-        when(result.fieldNames()).thenReturn( new String[0] );
+        when( result.fieldNames() ).thenReturn( new String[0] );
         when( result.executionType() ).thenReturn( query( READ_WRITE ) );
         when( result.queryStatistics() ).thenReturn( queryStatistics );
         when( result.getNotifications() ).thenReturn( Collections.emptyList() );
@@ -85,24 +94,24 @@ public void shouldIncludeBasicMetadata() throws Throwable
         CypherAdapterStream stream = new CypherAdapterStream( result, clock );
 
         // When
-        Map<String,Object> meta = metadataOf( stream );
+        MapValue meta = metadataOf( stream );
 
         // Then
-        assertThat( meta.get("type").toString(), equalTo( "rw") );
-        assertThat( meta.get("stats"), equalTo( map(
-                "nodes-created", 1,
-                "nodes-deleted", 2,
-                "relationships-created", 3,
-                "relationships-deleted", 4,
-                "properties-set", 5,
-                "indexes-added", 6,
-                "indexes-removed", 7,
-                "constraints-added", 8,
-                "constraints-removed", 9,
-                "labels-added", 10,
-                "labels-removed", 11
+        assertThat( meta.get( "type" ), equalTo( stringValue( "rw" ) ) );
+        assertThat( meta.get( "stats" ), equalTo( VirtualValues.map( mapValues(
+                "nodes-created", intValue( 1 ),
+                "nodes-deleted", intValue( 2 ),
+                "relationships-created", intValue( 3 ),
+                "relationships-deleted", intValue( 4 ),
+                "properties-set", intValue( 5 ),
+                "indexes-added", intValue( 6 ),
+                "indexes-removed", intValue( 7 ),
+                "constraints-added", intValue( 8 ),
+                "constraints-removed", intValue( 9 ),
+                "labels-added", intValue( 10 ),
+                "labels-removed", intValue( 11 ) )
         ) ) );
-        assertThat(meta.get("result_consumed_after"), equalTo(1337L));
+        assertThat( meta.get( "result_consumed_after" ), equalTo( longValue( 1337L ) ) );
     }
 
     @Test
@@ -112,34 +121,34 @@ public void shouldIncludePlanIfPresent() throws Throwable
         QueryStatistics queryStatistics = mock( QueryStatistics.class );
         when( queryStatistics.containsUpdates() ).thenReturn( false );
         QueryResult result = mock( QueryResult.class );
-        when(result.fieldNames()).thenReturn( new String[0] );
+        when( result.fieldNames() ).thenReturn( new String[0] );
         when( result.executionType() ).thenReturn( explained( READ_ONLY ) );
         when( result.queryStatistics() ).thenReturn( queryStatistics );
         when( result.getNotifications() ).thenReturn( Collections.emptyList() );
         when( result.executionPlanDescription() ).thenReturn(
-                plan("Join", map( "arg1", 1 ), singletonList( "id1" ),
-                plan("Scan", map( "arg2", 1 ), singletonList("id2")) ) );
+                plan( "Join", map( "arg1", 1 ), singletonList( "id1" ),
+                        plan( "Scan", map( "arg2", 1 ), singletonList( "id2" ) ) ) );
 
         TransactionalContext tc = mock( TransactionalContext.class );
         CypherAdapterStream stream = new CypherAdapterStream( result, Clock.systemUTC() );
 
         // When
-        Map<String,Object> meta = metadataOf( stream );
+        MapValue meta = metadataOf( stream );
 
         // Then
-        Map<String,Object> expectedChild = map(
-                "args", map( "arg2", 1 ),
-                "identifiers", Iterators.asSet("id2"),
-                "operatorType", "Scan",
-                "children", Collections.EMPTY_LIST
+        Map<String,AnyValue> expectedChild = mapValues(
+                "args", VirtualValues.map( mapValues( "arg2", intValue( 1 ) ) ),
+                "identifiers", list( stringValue( "id2" ) ),
+                "operatorType", stringValue( "Scan" ),
+                "children", VirtualValues.EMPTY_LIST
         );
-        Map<String,Object> expectedPlan = map(
-                "args", map( "arg1", 1 ),
-                "identifiers", Iterators.asSet("id1"),
-                "operatorType", "Join",
-                "children", Arrays.asList( expectedChild )
+        Map<String,AnyValue> expectedPlan = mapValues(
+                "args", VirtualValues.map( mapValues( "arg1", intValue( 1 ) ) ),
+                "identifiers", list( stringValue( "id1" ) ),
+                "operatorType", stringValue( "Join" ),
+                "children", list( VirtualValues.map( expectedChild ) )
         );
-        assertThat( meta.get( "plan" ), equalTo( expectedPlan ) );
+        assertThat( meta.get( "plan" ), equalTo( VirtualValues.map( expectedPlan ) ) );
     }
 
     @Test
@@ -149,7 +158,7 @@ public void shouldIncludeProfileIfPresent() throws Throwable
         QueryStatistics queryStatistics = mock( QueryStatistics.class );
         when( queryStatistics.containsUpdates() ).thenReturn( false );
         QueryResult result = mock( QueryResult.class );
-        when(result.fieldNames()).thenReturn( new String[0] );
+        when( result.fieldNames() ).thenReturn( new String[0] );
         when( result.executionType() ).thenReturn( explained( READ_ONLY ) );
         when( result.queryStatistics() ).thenReturn( queryStatistics );
         when( result.getNotifications() ).thenReturn( Collections.emptyList() );
@@ -161,34 +170,39 @@ public void shouldIncludeProfileIfPresent() throws Throwable
         CypherAdapterStream stream = new CypherAdapterStream( result, Clock.systemUTC() );
 
         // When
-        Map<String,Object> meta = metadataOf( stream );
+        MapValue meta = metadataOf( stream );
 
         // Then
-        Map<String,Object> expectedChild = map(
-                "args", map( "arg2", 1 ),
-                "identifiers", Iterators.asSet("id2"),
-                "operatorType", "Scan",
-                "children", Collections.EMPTY_LIST,
-                "rows", 1L,
-                "dbHits", 2L,
-                "pageCacheHits", 4L,
-                "pageCacheMisses", 7L,
-                "pageCacheHitRatio", 4.0 / 11
+        Map<String,AnyValue> expectedChild = mapValues(
+                "args", VirtualValues.map( mapValues( "arg2", intValue( 1 ) ) ),
+                "identifiers", list( stringValue( "id2" ) ),
+                "operatorType", stringValue( "Scan" ),
+                "children", VirtualValues.EMPTY_LIST,
+                "rows", longValue( 1L ),
+                "dbHits", longValue( 2L ),
+                "pageCacheHits", longValue( 4L ),
+                "pageCacheMisses", longValue( 7L ),
+                "pageCacheHitRatio", doubleValue( 4.0 / 11 )
         );
 
-        Map<String,Object> expectedProfile = map(
-                "args", map( "arg1", 1 ),
-                "identifiers", Iterators.asSet("id1"),
-                "operatorType", "Join",
-                "children", Arrays.asList( expectedChild ),
-                "rows", 1L,
-                "dbHits", 2L,
-                "pageCacheHits", 4L,
-                "pageCacheMisses", 3L,
-                "pageCacheHitRatio", 4.0 / 7
+        Map<String,AnyValue> expectedProfile = mapValues(
+                "args", VirtualValues.map( mapValues( "arg1", intValue( 1 ) ) ),
+                "identifiers", list( stringValue( "id1" ) ),
+                "operatorType", stringValue( "Join" ),
+                "children", list( VirtualValues.map( expectedChild ) ),
+                "rows", longValue( 1L ),
+                "dbHits", longValue( 2L ),
+                "pageCacheHits", longValue( 4L ),
+                "pageCacheMisses", longValue( 3L ),
+                "pageCacheHitRatio", doubleValue( 4.0 / 7 )
         );
 
-        assertMapEqualsWithDelta( (Map<String,Object>)meta.get( "profile" ), expectedProfile, 0.0001 );
+        assertMapEqualsWithDelta( (MapValue) meta.get( "profile" ), VirtualValues.map( expectedProfile ), 0.0001 );
+    }
+
+    private Map<String,AnyValue> mapValues( Object... values )
+    {
+        return genericMap( values );
     }
 
     @Test
@@ -196,7 +210,7 @@ public void shouldIncludeNotificationsIfPresent() throws Throwable
     {
         // Given
         QueryResult result = mock( QueryResult.class );
-        when(result.fieldNames()).thenReturn( new String[0] );
+        when( result.fieldNames() ).thenReturn( new String[0] );
 
         QueryStatistics queryStatistics = mock( QueryStatistics.class );
         when( queryStatistics.containsUpdates() ).thenReturn( false );
@@ -212,29 +226,33 @@ public void shouldIncludeNotificationsIfPresent() throws Throwable
         CypherAdapterStream stream = new CypherAdapterStream( result, Clock.systemUTC() );
 
         // When
-        Map<String,Object> meta = metadataOf( stream );
+        MapValue meta = metadataOf( stream );
 
         // Then
-        Map<String,Object> msg1 = map(
-                "severity", "WARNING",
-                "code", "Neo.ClientError.Schema.IndexNotFound",
-                "title", "The request (directly or indirectly) referred to an index that does not exist.",
-                "description", "The hinted index does not exist, please check the schema"
+        Map<String,AnyValue> msg1 = mapValues(
+                "severity", stringValue( "WARNING" ),
+                "code", stringValue( "Neo.ClientError.Schema.IndexNotFound" ),
+                "title",
+                stringValue( "The request (directly or indirectly) referred to an index that does not exist." ),
+                "description", stringValue( "The hinted index does not exist, please check the schema" )
         );
-        Map<String,Object> msg2 = map(
-                "severity", "WARNING",
-                "code", "Neo.ClientNotification.Statement.PlannerUnsupportedWarning",
-                "title", "This query is not supported by the COST planner.",
-                "description", "Using COST planner is unsupported for this query, please use RULE planner instead",
-                "position", map( "offset", 4, "column", 6, "line", 5 )
+        Map<String,AnyValue> msg2 = mapValues(
+                "severity", stringValue( "WARNING" ),
+                "code", stringValue( "Neo.ClientNotification.Statement.PlannerUnsupportedWarning" ),
+                "title", stringValue( "This query is not supported by the COST planner." ),
+                "description",
+                stringValue( "Using COST planner is unsupported for this query, please use RULE planner instead" ),
+                "position", VirtualValues
+                        .map( mapValues( "offset", intValue( 4 ), "column", intValue( 6 ), "line", intValue( 5 ) ) )
         );
 
-        assertThat( meta.get( "notifications" ), equalTo( Arrays.asList( msg1, msg2 ) ) );
+        assertThat( meta.get( "notifications" ),
+                equalTo( list( VirtualValues.map( msg1 ), VirtualValues.map( msg2 ) ) ) );
     }
 
-    private Map<String,Object> metadataOf( CypherAdapterStream stream ) throws Exception
+    private MapValue metadataOf( CypherAdapterStream stream ) throws Exception
     {
-        final Map<String, Object> meta = new HashMap<>();
+        final Map<String,AnyValue> meta = new HashMap<>();
         stream.accept( new BoltResult.Visitor()
         {
             @Override
@@ -244,31 +262,32 @@ public void visit( QueryResult.Record record ) throws Exception
             }
 
             @Override
-            public void addMetadata( String key, Object value )
+            public void addMetadata( String key, AnyValue value )
             {
                 meta.put( key, value );
             }
         } );
-        return meta;
+        return VirtualValues.map( meta );
     }
 
-    private static void assertMapEqualsWithDelta( Map<String,Object> a, Map<String,Object> b, double delta )
+    private static void assertMapEqualsWithDelta( MapValue a, MapValue b, double delta )
     {
-        assertThat( "Map should have same size", a.size(), equalTo(b.size()) );
-        for ( Map.Entry<String,Object> entry : a.entrySet() )
+        assertThat( "Map should have same size", a.size(), equalTo( b.size() ) );
+        for ( Map.Entry<String,AnyValue> entry : a.entrySet() )
         {
             String key = entry.getKey();
-            assertThat( "Missing key", b.get( key ) != null );
-            Object aValue = entry.getValue();
-            Object bValue = b.get( key );
-            if ( aValue instanceof Map )
+            //assertThat( "Missing key", b.get( key ) != Values.NO_VALUE );
+            AnyValue aValue = entry.getValue();
+            AnyValue bValue = b.get( key );
+            if ( aValue instanceof MapValue )
             {
-                assertThat( "Value mismatch", bValue instanceof Map );
-                assertMapEqualsWithDelta( (Map<String,Object>)aValue, (Map<String,Object>)bValue, delta);
+                assertThat( "Value mismatch", bValue instanceof MapValue );
+                assertMapEqualsWithDelta( (MapValue) aValue, (MapValue) bValue, delta );
             }
-            else if ( aValue instanceof Double )
+            else if ( aValue instanceof DoubleValue )
             {
-                assertThat( "Value mismatch", (double)aValue, closeTo( (double)bValue, delta ) );
+                assertThat( "Value mismatch", ((DoubleValue) aValue).doubleValue(),
+                        closeTo( ((DoubleValue) bValue).doubleValue(), delta ) );
             }
             else
             {
@@ -277,7 +296,7 @@ else if ( aValue instanceof Double )
         }
     }
 
-    private static ExecutionPlanDescription plan( final String name, final Map<String, Object> args, final long dbHits,
+    private static ExecutionPlanDescription plan( final String name, final Map<String,Object> args, final long dbHits,
             final long pageCacheHits, final long pageCacheMisses, final long rows, final List<String> identifiers,
             final ExecutionPlanDescription... children )
     {
@@ -309,15 +328,15 @@ public long getPageCacheMisses()
         }, children );
     }
 
-    private static ExecutionPlanDescription plan( final String name, final Map<String, Object> args,
-            final List<String> identifiers, final ExecutionPlanDescription ... children )
+    private static ExecutionPlanDescription plan( final String name, final Map<String,Object> args,
+            final List<String> identifiers, final ExecutionPlanDescription... children )
     {
         return plan( name, args, identifiers, null, children );
     }
 
-    private static ExecutionPlanDescription plan( final String name, final Map<String, Object> args,
+    private static ExecutionPlanDescription plan( final String name, final Map<String,Object> args,
             final List<String> identifiers, final ExecutionPlanDescription.ProfilerStatistics profile,
-            final ExecutionPlanDescription ... children )
+            final ExecutionPlanDescription... children )
     {
         return new ExecutionPlanDescription()
         {
@@ -330,7 +349,7 @@ public String getName()
             @Override
             public List<ExecutionPlanDescription> getChildren()
             {
-                return asList(children);
+                return asList( children );
             }
 
             @Override
diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/ExecutionPlanConverterTest.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/ExecutionPlanConverterTest.java
index c7e4d58a6c051..3d77dbacf93aa 100644
--- a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/ExecutionPlanConverterTest.java
+++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/ExecutionPlanConverterTest.java
@@ -29,8 +29,14 @@
 import org.neo4j.graphdb.ExecutionPlanDescription;
 import org.neo4j.helpers.collection.Iterators;
 import org.neo4j.helpers.collection.MapUtil;
+import org.neo4j.values.AnyValues;
+import org.neo4j.values.storable.DoubleValue;
+import org.neo4j.values.virtual.MapValue;
+import org.neo4j.values.virtual.VirtualValues;
 
 import static org.junit.Assert.assertEquals;
+import static org.neo4j.values.storable.Values.longValue;
+import static org.neo4j.values.storable.Values.stringValue;
 
 public class ExecutionPlanConverterTest
 {
@@ -38,18 +44,18 @@ public class ExecutionPlanConverterTest
     @Test
     public void profileStatisticConversion() throws Exception
     {
-        Map<String,Object> convertedMap = ExecutionPlanConverter.convert(
+        MapValue convertedMap = ExecutionPlanConverter.convert(
                 new TestExecutionPlanDescription( "description", getProfilerStatistics(), getIdentifiers(),
                         getArguments() ) );
-        assertEquals( convertedMap.get( "operatorType" ), "description" );
-        assertEquals( convertedMap.get( "args" ), getArguments() );
-        assertEquals( convertedMap.get( "identifiers" ), getIdentifiers() );
-        assertEquals( convertedMap.get( "children" ), Collections.emptyList() );
-        assertEquals( convertedMap.get( "rows" ), 1L );
-        assertEquals( convertedMap.get( "dbHits" ), 2L );
-        assertEquals( convertedMap.get( "pageCacheHits" ), 3L );
-        assertEquals( convertedMap.get( "pageCacheMisses" ), 2L );
-        assertEquals( (double)convertedMap.get( "pageCacheHitRatio" ), 3.0 / 5, 0.0001 );
+        assertEquals( convertedMap.get( "operatorType" ), stringValue( "description" ) );
+        assertEquals( convertedMap.get( "args" ), AnyValues.asMapValue( getArguments() ) );
+        assertEquals( convertedMap.get( "identifiers" ), AnyValues.asListValue( getIdentifiers() ));
+        assertEquals( convertedMap.get( "children" ), VirtualValues.EMPTY_LIST );
+        assertEquals( convertedMap.get( "rows" ), longValue( 1L ));
+        assertEquals( convertedMap.get( "dbHits" ), longValue( 2L ) );
+        assertEquals( convertedMap.get( "pageCacheHits" ), longValue( 3L ) );
+        assertEquals( convertedMap.get( "pageCacheMisses" ), longValue( 2L ) );
+        assertEquals( ((DoubleValue) convertedMap.get( "pageCacheHitRatio" )).doubleValue(),  3.0 / 5, 0.0001 );
         assertEquals( convertedMap.size(), 9 );
     }
 
@@ -60,7 +66,7 @@ private Map<String,Object> getArguments()
 
     private Set<String> getIdentifiers()
     {
-        return Iterators.asSet("identifier1", "identifier2");
+        return Iterators.asSet( "identifier1", "identifier2" );
     }
 
     private TestProfilerStatistics getProfilerStatistics()
diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/ResetFuzzTest.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/ResetFuzzTest.java
index 93b3a59977b02..bacd3666b8b12 100644
--- a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/ResetFuzzTest.java
+++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/ResetFuzzTest.java
@@ -47,6 +47,7 @@
 import org.neo4j.kernel.lifecycle.LifeSupport;
 import org.neo4j.logging.NullLog;
 import org.neo4j.values.result.QueryResult;
+import org.neo4j.values.virtual.MapValue;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
@@ -117,7 +118,7 @@ public void onFailure( Status status, String message ) throws IOException
             }
 
             @Override
-            public void onSuccess( Map metadata ) throws IOException
+            public void onSuccess( MapValue metadata ) throws IOException
             {
             }
         }, Runnables.EMPTY_RUNNABLE );
diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/BoltConnectionAuthIT.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/BoltConnectionAuthIT.java
index 3a95a73f77723..a80a3766cbb3f 100644
--- a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/BoltConnectionAuthIT.java
+++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/BoltConnectionAuthIT.java
@@ -19,11 +19,11 @@
  */
 package org.neo4j.bolt.v1.runtime.integration;
 
-import java.net.InetSocketAddress;
-
 import org.junit.Rule;
 import org.junit.Test;
 
+import java.net.InetSocketAddress;
+
 import org.neo4j.bolt.testing.BoltResponseRecorder;
 import org.neo4j.bolt.v1.runtime.BoltConnectionDescriptor;
 import org.neo4j.bolt.v1.runtime.BoltStateMachine;
@@ -36,6 +36,8 @@
 import static org.neo4j.bolt.testing.BoltMatchers.succeededWithMetadata;
 import static org.neo4j.bolt.testing.BoltMatchers.verifyKillsConnection;
 import static org.neo4j.helpers.collection.MapUtil.map;
+import static org.neo4j.values.storable.Values.TRUE;
+import static org.neo4j.values.storable.Values.stringValue;
 
 public class BoltConnectionAuthIT
 {
@@ -62,7 +64,7 @@ public void shouldGiveCredentialsExpiredStatusOnExpiredCredentials() throws Thro
         machine.run( "CREATE ()", map(), recorder );
 
         // Then
-        assertThat( recorder.nextResponse(), succeededWithMetadata( "credentials_expired", true ) );
+        assertThat( recorder.nextResponse(), succeededWithMetadata( "credentials_expired", TRUE ) );
         assertThat( recorder.nextResponse(), failedWithStatus( Status.Security.CredentialsExpired ) );
     }
 
@@ -71,7 +73,7 @@ public void shouldGiveKernelVersionOnInit() throws Throwable
     {
         // Given it is important for client applications to programmatically
         // identify expired credentials as the cause of not being authenticated
-        BoltStateMachine machine = env.newMachine( CONNECTION_DESCRIPTOR);
+        BoltStateMachine machine = env.newMachine( CONNECTION_DESCRIPTOR );
         BoltResponseRecorder recorder = new BoltResponseRecorder();
         String version = "Neo4j/" + Version.getNeo4jVersion();
         // When
@@ -82,7 +84,7 @@ public void shouldGiveKernelVersionOnInit() throws Throwable
         machine.run( "CREATE ()", map(), recorder );
 
         // Then
-        assertThat( recorder.nextResponse(), succeededWithMetadata( "server", version ) );
+        assertThat( recorder.nextResponse(), succeededWithMetadata( "server", stringValue( version ) ) );
     }
 
     @Test
@@ -115,7 +117,7 @@ public void shouldBeAbleToActOnSessionWhenUpdatingCredentials() throws Throwable
                 "principal", "neo4j",
                 "credentials", "neo4j",
                 "new_credentials", "secret"
-                ), recorder );
+        ), recorder );
         machine.run( "CREATE ()", map(), recorder );
 
         // then
diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/BoltConnectionIT.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/BoltConnectionIT.java
index e96094eea427f..b32b0de5efac7 100644
--- a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/BoltConnectionIT.java
+++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/BoltConnectionIT.java
@@ -40,6 +40,7 @@
 import org.neo4j.bolt.v1.runtime.spi.BoltResult;
 import org.neo4j.bolt.v1.runtime.spi.Record;
 import org.neo4j.kernel.api.exceptions.Status;
+import org.neo4j.values.AnyValue;
 
 import static java.util.Collections.emptyMap;
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -401,7 +402,7 @@ public void onRecords( BoltResult result, boolean pull ) throws Exception
             }
 
             @Override
-            public void onMetadata( String key, Object value )
+            public void onMetadata( String key, AnyValue value )
             {
             }
 
diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/spi/StreamMatchers.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/spi/StreamMatchers.java
index 0474a3443b41f..90c0d3e001330 100644
--- a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/spi/StreamMatchers.java
+++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/spi/StreamMatchers.java
@@ -27,6 +27,7 @@
 import java.util.Iterator;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import org.neo4j.values.AnyValue;
 import org.neo4j.values.result.QueryResult;
 
 import static java.util.Arrays.asList;
@@ -96,7 +97,7 @@ public void visit( QueryResult.Record record )
                         }
 
                         @Override
-                        public void addMetadata( String key, Object value )
+                        public void addMetadata( String key, AnyValue value )
                         {
 
                         }
diff --git a/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/ValueToObjectSerializer.java b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/ValueToObjectSerializer.java
index acdd4451907d6..60be553d9907b 100644
--- a/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/ValueToObjectSerializer.java
+++ b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/ValueToObjectSerializer.java
@@ -19,526 +19,46 @@
  */
 package org.neo4j.cypher.internal.javacompat;
 
-import java.lang.reflect.Array;
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Deque;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
 import org.neo4j.cypher.internal.compatibility.v3_3.runtime.CartesianPoint;
 import org.neo4j.cypher.internal.compatibility.v3_3.runtime.GeographicPoint;
 import org.neo4j.graphdb.Node;
-import org.neo4j.graphdb.Path;
-import org.neo4j.graphdb.PropertyContainer;
 import org.neo4j.graphdb.Relationship;
-import org.neo4j.helpers.collection.ReverseArrayIterator;
+import org.neo4j.graphdb.spatial.Point;
 import org.neo4j.kernel.impl.core.NodeManager;
-import org.neo4j.values.AnyValueWriter;
-import org.neo4j.values.storable.TextArray;
-import org.neo4j.values.storable.TextValue;
-import org.neo4j.values.virtual.CoordinateReferenceSystem;
-import org.neo4j.values.virtual.EdgeValue;
-import org.neo4j.values.virtual.MapValue;
-import org.neo4j.values.virtual.NodeValue;
-
-import static org.neo4j.helpers.collection.Iterators.iteratorsEqual;
+import org.neo4j.values.BaseToObjectValueWriter;
 
-public class ValueToObjectSerializer implements AnyValueWriter<RuntimeException>
+public class ValueToObjectSerializer extends BaseToObjectValueWriter<RuntimeException>
 {
     private final NodeManager nodeManager;
-    private final Deque<Writer> stack = new ArrayDeque<>();
-
     public ValueToObjectSerializer( NodeManager nodeManager )
     {
+        super();
         this.nodeManager = nodeManager;
-        stack.push( new ObjectWriter() );
-    }
-
-    public Object value()
-    {
-        assert stack.size() == 1;
-        return stack.getLast().value();
-    }
-
-    private void writeValue( Object value )
-    {
-        assert !stack.isEmpty();
-        Writer head = stack.peek();
-        head.write( value );
-    }
-
-    @Override
-    public void writeNodeReference( long nodeId ) throws RuntimeException
-    {
-        writeValue( nodeManager.newNodeProxyById( nodeId ) );
-    }
-
-    @Override
-    public void writeNode( long nodeId, TextArray ignore, MapValue properties ) throws RuntimeException
-    {
-        writeValue( nodeManager.newNodeProxyById( nodeId ) );
-    }
-
-    @Override
-    public void writeEdgeReference( long edgeId ) throws RuntimeException
-    {
-        writeValue( nodeManager.newRelationshipProxyById( edgeId ) );
-    }
-
-    @Override
-    public void writeEdge( long edgeId, long startNodeId, long endNodeId, TextValue type, MapValue properties )
-            throws RuntimeException
-    {
-        writeValue( nodeManager.newRelationshipProxyById( edgeId ) );
-    }
-
-    @Override
-    public void beginMap( int size ) throws RuntimeException
-    {
-        stack.push( new MapWriter( size ) );
-    }
-
-    @Override
-    public void endMap() throws RuntimeException
-    {
-        assert !stack.isEmpty();
-        writeValue( stack.pop().value() );
-    }
-
-    @Override
-    public void beginList( int size ) throws RuntimeException
-    {
-        stack.push( new ListWriter( size ) );
-    }
-
-    @Override
-    public void endList() throws RuntimeException
-    {
-        assert !stack.isEmpty();
-        writeValue( stack.pop().value() );
-    }
-
-    @Override
-    public void writePath( NodeValue[] nodes, EdgeValue[] edges ) throws RuntimeException
-    {
-        assert nodes != null;
-        assert nodes.length > 0;
-        Node[] nodeProxies = new Node[nodes.length];
-        for ( int i = 0; i < nodes.length; i++ )
-        {
-            nodeProxies[i] = nodeManager.newNodeProxyById( nodes[i].id() );
-        }
-        Relationship[] relationship = new Relationship[edges.length];
-        for ( int i = 0; i < edges.length; i++ )
-        {
-            relationship[i] = nodeManager.newRelationshipProxyById( edges[i].id() );
-        }
-        writeValue( new Path()
-        {
-            @Override
-            public Node startNode()
-            {
-                return nodeProxies[0];
-            }
-
-            @Override
-            public Node endNode()
-            {
-                return nodeProxies[nodeProxies.length - 1];
-            }
-
-            @Override
-            public Relationship lastRelationship()
-            {
-                return relationship[relationship.length - 1];
-            }
-
-            @Override
-            public Iterable<Relationship> relationships()
-            {
-                return Arrays.asList( relationship );
-            }
-
-            @Override
-            public Iterable<Relationship> reverseRelationships()
-            {
-                return () -> new ReverseArrayIterator<>( relationship );
-            }
-
-            @Override
-            public Iterable<Node> nodes()
-            {
-                return Arrays.asList( nodeProxies );
-            }
-
-            @Override
-            public Iterable<Node> reverseNodes()
-            {
-                return () -> new ReverseArrayIterator<>( nodeProxies );
-            }
-
-            @Override
-            public int length()
-            {
-                return relationship.length;
-            }
-
-            @Override
-            public int hashCode()
-            {
-                if ( relationship.length == 0 )
-                {
-                    return startNode().hashCode();
-                }
-                else
-                {
-                    return Arrays.hashCode( relationship );
-                }
-            }
-
-            @Override
-            public boolean equals( Object obj )
-            {
-                if ( this == obj )
-                {
-                    return true;
-                }
-                else if ( obj instanceof Path )
-                {
-                    Path other = (Path) obj;
-                    return startNode().equals( other.startNode() ) &&
-                           iteratorsEqual( this.relationships().iterator(), other.relationships().iterator() );
-
-                }
-                else
-                {
-                    return false;
-                }
-            }
-
-            @Override
-            public Iterator<PropertyContainer> iterator()
-            {
-                return new Iterator<PropertyContainer>()
-                {
-                    Iterator<? extends PropertyContainer> current = nodes().iterator();
-                    Iterator<? extends PropertyContainer> next = relationships().iterator();
-
-                    public boolean hasNext()
-                    {
-                        return current.hasNext();
-                    }
-
-                    public PropertyContainer next()
-                    {
-                        try
-                        {
-                            return current.next();
-                        }
-                        finally
-                        {
-                            Iterator<? extends PropertyContainer> temp = current;
-                            current = next;
-                            next = temp;
-                        }
-                    }
-
-                    public void remove()
-                    {
-                        next.remove();
-                    }
-                };
-            }
-        } );
-    }
-
-    @Override
-    public void beginPoint( CoordinateReferenceSystem coordinateReferenceSystem ) throws RuntimeException
-    {
-        stack.push( new PointWriter( coordinateReferenceSystem ) );
-    }
-
-    @Override
-    public void endPoint() throws RuntimeException
-    {
-        assert !stack.isEmpty();
-        writeValue( stack.pop().value() );
-    }
-
-    @Override
-    public void writeNull() throws RuntimeException
-    {
-        writeValue( null );
-    }
-
-    @Override
-    public void writeBoolean( boolean value ) throws RuntimeException
-    {
-        writeValue( value );
-    }
-
-    @Override
-    public void writeInteger( byte value ) throws RuntimeException
-    {
-        writeValue( value );
-    }
-
-    @Override
-    public void writeInteger( short value ) throws RuntimeException
-    {
-        writeValue( value );
-    }
-
-    @Override
-    public void writeInteger( int value ) throws RuntimeException
-    {
-        writeValue( value );
-    }
-
-    @Override
-    public void writeInteger( long value ) throws RuntimeException
-    {
-        writeValue( value );
-    }
-
-    @Override
-    public void writeFloatingPoint( float value ) throws RuntimeException
-    {
-        writeValue( value );
-    }
-
-    @Override
-    public void writeFloatingPoint( double value ) throws RuntimeException
-    {
-        writeValue( value );
-    }
-
-    @Override
-    public void writeString( String value ) throws RuntimeException
-    {
-        writeValue( value );
-    }
-
-    @Override
-    public void writeString( char value ) throws RuntimeException
-    {
-        writeValue( value );
-    }
-
-    @Override
-    public void writeString( char[] value, int offset, int length ) throws RuntimeException
-    {
-        writeValue( new String( value, offset, length ) );
-    }
-
-    @Override
-    public void beginUTF8( int size ) throws RuntimeException
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void copyUTF8( long fromAddress, int length ) throws RuntimeException
-    {
-        throw new UnsupportedOperationException();
     }
 
     @Override
-    public void endUTF8() throws RuntimeException
+    protected Node newNodeProxyById( long id )
     {
-        throw new UnsupportedOperationException();
+        return nodeManager.newNodeProxyById( id );
     }
 
     @Override
-    public void beginArray( int size, ArrayType arrayType ) throws RuntimeException
+    protected Relationship newRelationshipProxyById( long id )
     {
-        stack.push( new ArrayWriter( size, arrayType ) );
+        return nodeManager.newRelationshipProxyById( id );
     }
 
     @Override
-    public void endArray() throws RuntimeException
+    protected Point newGeographicPoint( double longitude, double latitude, String name, int code, String href )
     {
-        assert !stack.isEmpty();
-        writeValue( stack.pop().value() );
+        return new GeographicPoint( longitude, latitude,
+                new org.neo4j.cypher.internal.compatibility.v3_3.runtime.CRS( name, code, href ) );
     }
 
     @Override
-    public void writeByteArray( byte[] value ) throws RuntimeException
-    {
-        writeValue( value );
-    }
-
-    interface Writer
-    {
-        void write( Object value );
-
-        Object value();
-    }
-
-    class ObjectWriter implements Writer
-    {
-        private Object value;
-
-        @Override
-        public void write( Object value )
-        {
-            this.value = value;
-        }
-
-        @Override
-        public Object value()
-        {
-            return value;
-        }
-    }
-
-    class MapWriter implements Writer
-    {
-        private String key;
-        private boolean isKey = true;
-        private final HashMap<String,Object> map;
-
-        MapWriter( int size )
-        {
-            this.map = new HashMap<>( size );
-        }
-
-        @Override
-        public void write( Object value )
-        {
-            if ( isKey )
-            {
-                key = (String) value;
-                isKey = false;
-            }
-            else
-            {
-                map.put( key, value );
-                isKey = true;
-            }
-        }
-
-        @Override
-        public Object value()
-        {
-            return map;
-        }
-    }
-
-    class ArrayWriter implements Writer
-    {
-        protected final Object array;
-        private int index;
-
-        ArrayWriter( int size, ArrayType arrayType )
-        {
-            switch ( arrayType )
-            {
-            case SHORT:
-                this.array = Array.newInstance( short.class, size );
-                break;
-            case INT:
-                this.array = Array.newInstance( int.class, size );
-                break;
-            case BYTE:
-                this.array = Array.newInstance( byte.class, size );
-                break;
-            case LONG:
-                this.array = Array.newInstance( long.class, size );
-                break;
-            case FLOAT:
-                this.array = Array.newInstance( float.class, size );
-                break;
-            case DOUBLE:
-                this.array = Array.newInstance( double.class, size );
-                break;
-            case BOOLEAN:
-                this.array = Array.newInstance( boolean.class, size );
-                break;
-            case STRING:
-                this.array = Array.newInstance( String.class, size );
-                break;
-            case CHAR:
-                this.array = Array.newInstance( char.class, size );
-                break;
-            default:
-                this.array = new Object[size];
-            }
-        }
-
-        @Override
-        public void write( Object value )
-        {
-            Array.set( array, index++, value );
-        }
-
-        @Override
-        public Object value()
-        {
-            return array;
-        }
-    }
-
-    class ListWriter implements Writer
+    protected Point newCartesianPoint( double x, double y, String name, int code, String href )
     {
-        private final List<Object> list;
-
-        ListWriter( int size )
-        {
-            this.list = new ArrayList<>( size );
-        }
-
-        @Override
-        public void write( Object value )
-        {
-            list.add( value );
-        }
-
-        @Override
-        public Object value()
-        {
-            return list;
-        }
-    }
-
-    class PointWriter implements Writer
-    {
-        //TODO it is quite silly that the point writer doesn't give me the whole thing at once
-        private final double[] coordinates = new double[2];
-        private int index;
-        private final CoordinateReferenceSystem crs;
-
-        PointWriter( CoordinateReferenceSystem crs )
-        {
-            this.crs = crs;
-        }
-
-        @Override
-        public void write( Object value )
-        {
-            coordinates[index++] = (double) value;
-        }
-
-        @Override
-        public Object value()
-        {
-            if ( crs.code() == CoordinateReferenceSystem.WGS84.code() )
-            {
-                return new GeographicPoint( coordinates[0], coordinates[1], new org.neo4j.cypher.internal
-                        .compatibility.v3_3.runtime.CRS( crs.name, crs.code, crs.href ) );
-            }
-            else if ( crs.code() == CoordinateReferenceSystem.Cartesian.code() )
-            {
-                return new CartesianPoint( coordinates[0], coordinates[1], new org.neo4j.cypher.internal
-                        .compatibility.v3_3.runtime.CRS( crs.name, crs.code, crs.href ) );
-            }
-            else
-            {
-                throw new IllegalArgumentException( crs + " is not a supported coordinate reference system" );
-            }
-        }
+        return new CartesianPoint( x, y,
+                new org.neo4j.cypher.internal.compatibility.v3_3.runtime.CRS( name, code, href ) );
     }
 }
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v2_3/Compatibility.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v2_3/Compatibility.scala
index 5fa365a27eeaa..a407096b5af71 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v2_3/Compatibility.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v2_3/Compatibility.scala
@@ -28,9 +28,9 @@ import org.neo4j.cypher.internal.compiler.v2_3.executionplan.{EntityAccessor, Ex
 import org.neo4j.cypher.internal.compiler.v2_3.spi.{PlanContext, QueryContext}
 import org.neo4j.cypher.internal.compiler.v2_3.tracing.rewriters.RewriterStepSequencer
 import org.neo4j.cypher.internal.compiler.v2_3.{InfoLogger, ExplainMode => ExplainModev2_3, NormalMode => NormalModev2_3, ProfileMode => ProfileModev2_3, _}
-import org.neo4j.cypher.internal.spi.v2_3.{TransactionBoundGraphStatistics, TransactionBoundPlanContext, TransactionBoundQueryContext}
 import org.neo4j.cypher.internal.frontend.v3_3
 import org.neo4j.cypher.internal.javacompat.ExecutionResult
+import org.neo4j.cypher.internal.spi.v2_3.{TransactionBoundGraphStatistics, TransactionBoundPlanContext, TransactionBoundQueryContext}
 import org.neo4j.cypher.internal.spi.v3_3.TransactionalContextWrapper
 import org.neo4j.graphdb.{Node, Relationship, Result}
 import org.neo4j.kernel.GraphDatabaseQueryService
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/commands/expressions/Add.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/commands/expressions/Add.scala
index f66693db7eeba..52a1999a77f14 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/commands/expressions/Add.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/commands/expressions/Add.scala
@@ -26,7 +26,7 @@ import org.neo4j.cypher.internal.frontend.v3_3.CypherTypeException
 import org.neo4j.cypher.internal.frontend.v3_3.symbols._
 import org.neo4j.values._
 import org.neo4j.values.storable._
-import org.neo4j.values.virtual.ListValue
+import org.neo4j.values.virtual.{ListValue, VirtualValues}
 
 case class Add(a: Expression, b: Expression) extends Expression with TypeSafeMathSupport {
   def apply(ctx: ExecutionContext)(implicit state: QueryState): AnyValue = {
@@ -38,9 +38,9 @@ case class Add(a: Expression, b: Expression) extends Expression with TypeSafeMat
       case (x: IntegralValue, y: IntegralValue) => Values.longValue(StrictMath.addExact(x.longValue(),y.longValue()))
       case (x: NumberValue, y: NumberValue) => Values.doubleValue(x.doubleValue() + y.doubleValue())
       case (x: TextValue, y: TextValue) => Values.stringValue(x.stringValue() + y.stringValue())
-      case (x: ListValue, y: ListValue) => AnyValues.concat(x, y)
-      case (x: ListValue, y)         => AnyValues.appendToList(x, y)
-      case (x, y: ListValue)         => AnyValues.prependToList(y, x)
+      case (x: ListValue, y: ListValue) => VirtualValues.concat(x, y)
+      case (x: ListValue, y)         => VirtualValues.appendToList(x, y)
+      case (x, y: ListValue)         => VirtualValues.prependToList(y, x)
       case (x: TextValue, y: IntegralValue) => Values.stringValue(x.stringValue() + y.longValue())
       case (x: IntegralValue, y: TextValue) => Values.stringValue(x.longValue() + y.stringValue())
       case (x: TextValue, y: FloatValue) => Values.stringValue(x.stringValue() + y.doubleValue())
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/commands/expressions/DesugaredMapProjection.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/commands/expressions/DesugaredMapProjection.scala
index cdff8087e9878..da13d7680954f 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/commands/expressions/DesugaredMapProjection.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/commands/expressions/DesugaredMapProjection.scala
@@ -23,9 +23,9 @@ import org.neo4j.cypher.internal.compatibility.v3_3.runtime.ExecutionContext
 import org.neo4j.cypher.internal.compatibility.v3_3.runtime.helpers.IsMap
 import org.neo4j.cypher.internal.compatibility.v3_3.runtime.mutation.GraphElementPropertyFunctions
 import org.neo4j.cypher.internal.compatibility.v3_3.runtime.pipes.QueryState
+import org.neo4j.values.AnyValue
 import org.neo4j.values.storable.Values
 import org.neo4j.values.virtual.VirtualValues
-import org.neo4j.values.{AnyValue, AnyValues}
 
 import scala.collection.JavaConverters._
 import scala.collection.Map
@@ -45,7 +45,7 @@ case class DesugaredMapProjection(id: String, includeAllProps: Boolean, literalE
     }.toMap.asJava
 
 
-    AnyValues.combine(mapOfProperties, VirtualValues.map(mapOfLiteralValues))
+    VirtualValues.combine(mapOfProperties, VirtualValues.map(mapOfLiteralValues))
   }
 
   override def rewrite(f: (Expression) => Expression) =
diff --git a/community/values/src/main/java/org/neo4j/values/AnyValues.java b/community/values/src/main/java/org/neo4j/values/AnyValues.java
index ec856c36d08ec..d76134ca1606a 100644
--- a/community/values/src/main/java/org/neo4j/values/AnyValues.java
+++ b/community/values/src/main/java/org/neo4j/values/AnyValues.java
@@ -222,49 +222,6 @@ public static MapValue asMapValue( Map<String,Object> map )
         return map( mapValues( map ) );
     }
 
-    public static ListValue concat( ListValue... lists )
-    {
-        int totalSize = 0;
-        for ( ListValue list : lists )
-        {
-            totalSize += list.size();
-        }
-
-        AnyValue[] anyValues = new AnyValue[totalSize];
-        int startPoint = 0;
-        for ( ListValue list : lists )
-        {
-            System.arraycopy( list.asArray(), 0, anyValues, startPoint, list.size() );
-            startPoint += list.size();
-        }
-
-        return VirtualValues.list( anyValues );
-    }
-
-    public static MapValue combine( MapValue a, MapValue b )
-    {
-        HashMap<String,AnyValue> map = new HashMap<>( a.size() + b.size() );
-        a.foreach( map::put );
-        b.foreach( map::put );
-        return VirtualValues.map( map );
-    }
-
-    public static ListValue appendToList( ListValue list, AnyValue value )
-    {
-        AnyValue[] newValues = new AnyValue[list.size() + 1];
-        System.arraycopy( list.asArray(), 0, newValues, 0, list.size() );
-        newValues[list.size()] = value;
-        return VirtualValues.list( newValues );
-    }
-
-    public static ListValue prependToList( ListValue list, AnyValue value )
-    {
-        AnyValue[] newValues = new AnyValue[list.size() + 1];
-        newValues[0] = value;
-        System.arraycopy( list.asArray(), 0, newValues, 1, list.size() );
-        return VirtualValues.list( newValues );
-    }
-
     public static PointValue fromMap( MapValue map )
     {
         if ( map.containsKey( "x" ) && map.containsKey( "y" ) )
diff --git a/community/values/src/main/java/org/neo4j/values/BaseToObjectValueWriter.java b/community/values/src/main/java/org/neo4j/values/BaseToObjectValueWriter.java
new file mode 100644
index 0000000000000..fd6ee3cce9b0b
--- /dev/null
+++ b/community/values/src/main/java/org/neo4j/values/BaseToObjectValueWriter.java
@@ -0,0 +1,545 @@
+/*
+ * Copyright (c) 2002-2017 "Neo Technology,"
+ * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Neo4j is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.neo4j.values;
+
+import java.lang.reflect.Array;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+
+import org.neo4j.graphdb.Node;
+import org.neo4j.graphdb.Path;
+import org.neo4j.graphdb.PropertyContainer;
+import org.neo4j.graphdb.Relationship;
+import org.neo4j.graphdb.spatial.Point;
+import org.neo4j.helpers.collection.ReverseArrayIterator;
+import org.neo4j.values.storable.TextArray;
+import org.neo4j.values.storable.TextValue;
+import org.neo4j.values.virtual.CoordinateReferenceSystem;
+import org.neo4j.values.virtual.EdgeValue;
+import org.neo4j.values.virtual.MapValue;
+import org.neo4j.values.virtual.NodeValue;
+
+import static org.neo4j.helpers.collection.Iterators.iteratorsEqual;
+
+public abstract class BaseToObjectValueWriter<E extends Exception> implements AnyValueWriter<E>
+{
+    private final Deque<Writer> stack = new ArrayDeque<>();
+
+    public BaseToObjectValueWriter()
+    {
+        stack.push( new ObjectWriter() );
+    }
+
+    protected abstract Node newNodeProxyById( long id );
+
+    protected abstract Relationship newRelationshipProxyById( long id );
+
+    protected abstract Point newGeographicPoint( double longitude, double latitude, String name, int code, String href );
+
+    protected abstract Point newCartesianPoint( double x, double y, String name, int code, String href );
+
+    public Object value()
+    {
+        assert stack.size() == 1;
+        return stack.getLast().value();
+    }
+
+    private void writeValue( Object value )
+    {
+        assert !stack.isEmpty();
+        Writer head = stack.peek();
+        head.write( value );
+    }
+
+    @Override
+    public void writeNodeReference( long nodeId ) throws RuntimeException
+    {
+        writeValue( newNodeProxyById( nodeId ) );
+    }
+
+    @Override
+    public void writeNode( long nodeId, TextArray ignore, MapValue properties ) throws RuntimeException
+    {
+        writeValue( newNodeProxyById( nodeId ) );
+    }
+
+    @Override
+    public void writeEdgeReference( long edgeId ) throws RuntimeException
+    {
+        writeValue( newRelationshipProxyById( edgeId ) );
+    }
+
+    @Override
+    public void writeEdge( long edgeId, long startNodeId, long endNodeId, TextValue type, MapValue properties )
+            throws RuntimeException
+    {
+        writeValue( newRelationshipProxyById( edgeId ) );
+    }
+
+    @Override
+    public void beginMap( int size ) throws RuntimeException
+    {
+        stack.push( new MapWriter( size ) );
+    }
+
+    @Override
+    public void endMap() throws RuntimeException
+    {
+        assert !stack.isEmpty();
+        writeValue( stack.pop().value() );
+    }
+
+    @Override
+    public void beginList( int size ) throws RuntimeException
+    {
+        stack.push( new ListWriter( size ) );
+    }
+
+    @Override
+    public void endList() throws RuntimeException
+    {
+        assert !stack.isEmpty();
+        writeValue( stack.pop().value() );
+    }
+
+    @Override
+    public void writePath( NodeValue[] nodes, EdgeValue[] edges ) throws RuntimeException
+    {
+        assert nodes != null;
+        assert nodes.length > 0;
+        Node[] nodeProxies = new Node[nodes.length];
+        for ( int i = 0; i < nodes.length; i++ )
+        {
+            nodeProxies[i] = newNodeProxyById( nodes[i].id() );
+        }
+        Relationship[] relationship = new Relationship[edges.length];
+        for ( int i = 0; i < edges.length; i++ )
+        {
+            relationship[i] = newRelationshipProxyById( edges[i].id() );
+        }
+        writeValue( new Path()
+        {
+            @Override
+            public Node startNode()
+            {
+                return nodeProxies[0];
+            }
+
+            @Override
+            public Node endNode()
+            {
+                return nodeProxies[nodeProxies.length - 1];
+            }
+
+            @Override
+            public Relationship lastRelationship()
+            {
+                return relationship[relationship.length - 1];
+            }
+
+            @Override
+            public Iterable<Relationship> relationships()
+            {
+                return Arrays.asList( relationship );
+            }
+
+            @Override
+            public Iterable<Relationship> reverseRelationships()
+            {
+                return () -> new ReverseArrayIterator<>( relationship );
+            }
+
+            @Override
+            public Iterable<Node> nodes()
+            {
+                return Arrays.asList( nodeProxies );
+            }
+
+            @Override
+            public Iterable<Node> reverseNodes()
+            {
+                return () -> new ReverseArrayIterator<>( nodeProxies );
+            }
+
+            @Override
+            public int length()
+            {
+                return relationship.length;
+            }
+
+            @Override
+            public int hashCode()
+            {
+                if ( relationship.length == 0 )
+                {
+                    return startNode().hashCode();
+                }
+                else
+                {
+                    return Arrays.hashCode( relationship );
+                }
+            }
+
+            @Override
+            public boolean equals( Object obj )
+            {
+                if ( this == obj )
+                {
+                    return true;
+                }
+                else if ( obj instanceof Path )
+                {
+                    Path other = (Path) obj;
+                    return startNode().equals( other.startNode() ) &&
+                           iteratorsEqual( this.relationships().iterator(), other.relationships().iterator() );
+
+                }
+                else
+                {
+                    return false;
+                }
+            }
+
+            @Override
+            public Iterator<PropertyContainer> iterator()
+            {
+                return new Iterator<PropertyContainer>()
+                {
+                    Iterator<? extends PropertyContainer> current = nodes().iterator();
+                    Iterator<? extends PropertyContainer> next = relationships().iterator();
+
+                    public boolean hasNext()
+                    {
+                        return current.hasNext();
+                    }
+
+                    public PropertyContainer next()
+                    {
+                        try
+                        {
+                            return current.next();
+                        }
+                        finally
+                        {
+                            Iterator<? extends PropertyContainer> temp = current;
+                            current = next;
+                            next = temp;
+                        }
+                    }
+
+                    public void remove()
+                    {
+                        next.remove();
+                    }
+                };
+            }
+        } );
+    }
+
+    @Override
+    public void beginPoint( CoordinateReferenceSystem coordinateReferenceSystem ) throws RuntimeException
+    {
+        stack.push( new PointWriter( coordinateReferenceSystem ) );
+    }
+
+    @Override
+    public void endPoint() throws RuntimeException
+    {
+        assert !stack.isEmpty();
+        writeValue( stack.pop().value() );
+    }
+
+    @Override
+    public void writeNull() throws RuntimeException
+    {
+        writeValue( null );
+    }
+
+    @Override
+    public void writeBoolean( boolean value ) throws RuntimeException
+    {
+        writeValue( value );
+    }
+
+    @Override
+    public void writeInteger( byte value ) throws RuntimeException
+    {
+        writeValue( value );
+    }
+
+    @Override
+    public void writeInteger( short value ) throws RuntimeException
+    {
+        writeValue( value );
+    }
+
+    @Override
+    public void writeInteger( int value ) throws RuntimeException
+    {
+        writeValue( value );
+    }
+
+    @Override
+    public void writeInteger( long value ) throws RuntimeException
+    {
+        writeValue( value );
+    }
+
+    @Override
+    public void writeFloatingPoint( float value ) throws RuntimeException
+    {
+        writeValue( value );
+    }
+
+    @Override
+    public void writeFloatingPoint( double value ) throws RuntimeException
+    {
+        writeValue( value );
+    }
+
+    @Override
+    public void writeString( String value ) throws RuntimeException
+    {
+        writeValue( value );
+    }
+
+    @Override
+    public void writeString( char value ) throws RuntimeException
+    {
+        writeValue( value );
+    }
+
+    @Override
+    public void writeString( char[] value, int offset, int length ) throws RuntimeException
+    {
+        writeValue( new String( value, offset, length ) );
+    }
+
+    @Override
+    public void beginUTF8( int size ) throws RuntimeException
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void copyUTF8( long fromAddress, int length ) throws RuntimeException
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void endUTF8() throws RuntimeException
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void beginArray( int size, ArrayType arrayType ) throws RuntimeException
+    {
+        stack.push( new ArrayWriter( size, arrayType ) );
+    }
+
+    @Override
+    public void endArray() throws RuntimeException
+    {
+        assert !stack.isEmpty();
+        writeValue( stack.pop().value() );
+    }
+
+    @Override
+    public void writeByteArray( byte[] value ) throws RuntimeException
+    {
+        writeValue( value );
+    }
+
+    private interface Writer
+    {
+        void write( Object value );
+
+        Object value();
+    }
+
+    private static class ObjectWriter implements Writer
+    {
+        private Object value;
+
+        @Override
+        public void write( Object value )
+        {
+            this.value = value;
+        }
+
+        @Override
+        public Object value()
+        {
+            return value;
+        }
+    }
+
+    private static class MapWriter implements Writer
+    {
+        private String key;
+        private boolean isKey = true;
+        private final HashMap<String,Object> map;
+
+        MapWriter( int size )
+        {
+            this.map = new HashMap<>( size );
+        }
+
+        @Override
+        public void write( Object value )
+        {
+            if ( isKey )
+            {
+                key = (String) value;
+                isKey = false;
+            }
+            else
+            {
+                map.put( key, value );
+                isKey = true;
+            }
+        }
+
+        @Override
+        public Object value()
+        {
+            return map;
+        }
+    }
+
+    private static class ArrayWriter implements Writer
+    {
+        protected final Object array;
+        private int index;
+
+        ArrayWriter( int size, ArrayType arrayType )
+        {
+            switch ( arrayType )
+            {
+            case SHORT:
+                this.array = Array.newInstance( short.class, size );
+                break;
+            case INT:
+                this.array = Array.newInstance( int.class, size );
+                break;
+            case BYTE:
+                this.array = Array.newInstance( byte.class, size );
+                break;
+            case LONG:
+                this.array = Array.newInstance( long.class, size );
+                break;
+            case FLOAT:
+                this.array = Array.newInstance( float.class, size );
+                break;
+            case DOUBLE:
+                this.array = Array.newInstance( double.class, size );
+                break;
+            case BOOLEAN:
+                this.array = Array.newInstance( boolean.class, size );
+                break;
+            case STRING:
+                this.array = Array.newInstance( String.class, size );
+                break;
+            case CHAR:
+                this.array = Array.newInstance( char.class, size );
+                break;
+            default:
+                this.array = new Object[size];
+            }
+        }
+
+        @Override
+        public void write( Object value )
+        {
+            Array.set( array, index++, value );
+        }
+
+        @Override
+        public Object value()
+        {
+            return array;
+        }
+    }
+
+    private static class ListWriter implements Writer
+    {
+        private final List<Object> list;
+
+        ListWriter( int size )
+        {
+            this.list = new ArrayList<>( size );
+        }
+
+        @Override
+        public void write( Object value )
+        {
+            list.add( value );
+        }
+
+        @Override
+        public Object value()
+        {
+            return list;
+        }
+    }
+
+    private class PointWriter implements Writer
+    {
+        //TODO it is quite silly that the point writer doesn't give me the whole thing at once
+        private final double[] coordinates = new double[2];
+        private int index;
+        private final CoordinateReferenceSystem crs;
+
+        PointWriter( CoordinateReferenceSystem crs )
+        {
+            this.crs = crs;
+        }
+
+        @Override
+        public void write( Object value )
+        {
+            coordinates[index++] = (double) value;
+        }
+
+        @Override
+        public Object value()
+        {
+            if ( crs.code() == CoordinateReferenceSystem.WGS84.code() )
+            {
+                return newGeographicPoint( coordinates[0], coordinates[1], crs.name, crs.code, crs.href );
+            }
+            else if ( crs.code() == CoordinateReferenceSystem.Cartesian.code() )
+            {
+                return newCartesianPoint( coordinates[0], coordinates[1], crs.name, crs.code, crs.href );
+            }
+            else
+            {
+                throw new IllegalArgumentException( crs + " is not a supported coordinate reference system" );
+            }
+        }
+    }
+}
diff --git a/community/values/src/main/java/org/neo4j/values/storable/TextArray.java b/community/values/src/main/java/org/neo4j/values/storable/TextArray.java
index fcae1a313d447..f3482cc4bfcba 100644
--- a/community/values/src/main/java/org/neo4j/values/storable/TextArray.java
+++ b/community/values/src/main/java/org/neo4j/values/storable/TextArray.java
@@ -21,7 +21,7 @@
 
 public abstract class TextArray extends ArrayValue
 {
-    abstract String stringValue( int offset );
+    public abstract String stringValue( int offset );
 
     public int compareTo( TextArray other )
     {
diff --git a/community/values/src/main/java/org/neo4j/values/virtual/ArrayHelpers.java b/community/values/src/main/java/org/neo4j/values/virtual/ArrayHelpers.java
index 79aca0cedd9e5..b24f8727e59bd 100644
--- a/community/values/src/main/java/org/neo4j/values/virtual/ArrayHelpers.java
+++ b/community/values/src/main/java/org/neo4j/values/virtual/ArrayHelpers.java
@@ -21,12 +21,12 @@
 
 import java.util.Comparator;
 import java.util.Iterator;
+import java.util.List;
 import java.util.NoSuchElementException;
 
 import org.neo4j.values.AnyValue;
-import org.neo4j.values.storable.Value;
-import org.neo4j.values.storable.Values;
 import org.neo4j.values.VirtualValue;
+import org.neo4j.values.storable.Value;
 
 /**
  * This class is way too similar to org.neo4j.collection.primitive.PrimitiveArrays.
@@ -87,6 +87,18 @@ static boolean containsNull( AnyValue[] values )
         return false;
     }
 
+    static boolean containsNull( List<AnyValue> values )
+    {
+        for ( AnyValue value : values )
+        {
+            if ( value == null )
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
     static <T> Iterator<T> asIterator( T[] array )
     {
         assert array != null;
diff --git a/community/values/src/main/java/org/neo4j/values/virtual/ListValue.java b/community/values/src/main/java/org/neo4j/values/virtual/ListValue.java
index 6c9d82d7b35cc..c1627770b46b5 100644
--- a/community/values/src/main/java/org/neo4j/values/virtual/ListValue.java
+++ b/community/values/src/main/java/org/neo4j/values/virtual/ListValue.java
@@ -22,6 +22,7 @@
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Iterator;
+import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.function.Function;
 
@@ -34,7 +35,7 @@
 
 import static org.neo4j.values.virtual.ArrayHelpers.containsNull;
 
-public abstract class ListValue extends VirtualValue implements  SequenceValue, Iterable<AnyValue>
+public abstract class ListValue extends VirtualValue implements SequenceValue, Iterable<AnyValue>
 {
     public abstract int size();
 
@@ -57,6 +58,24 @@ public boolean storable()
         return false;
     }
 
+    @Override
+    public String toString()
+    {
+        StringBuilder sb = new StringBuilder( "List{" );
+        int i = 0;
+        for ( ; i < size() - 1; i++ )
+        {
+            sb.append( value( i ) );
+            sb.append( ", " );
+        }
+        if ( size() > 0 )
+        {
+            sb.append( value( i ) );
+        }
+        sb.append( '}' );
+        return sb.toString();
+    }
+
     public ArrayValue toStorableArray()
     {
         throw new UnsupportedOperationException( "List cannot be turned into a storable array" );
@@ -230,27 +249,57 @@ public AnyValue[] asArray()
         }
 
         @Override
-        public String toString()
+        public int hash()
         {
-            StringBuilder sb = new StringBuilder( "List{" );
-            int i = 0;
-            for ( ; i < values.length - 1; i++ )
-            {
-                sb.append( values[i] );
-                sb.append( ", " );
-            }
-            if ( values.length > 0 )
+            return Arrays.hashCode( values );
+        }
+    }
+
+    static final class JavaListListValue extends ListValue
+    {
+        private final List<AnyValue> values;
+
+        JavaListListValue( List<AnyValue> values )
+        {
+            assert values != null;
+            assert !containsNull( values );
+
+            this.values = values;
+        }
+
+        @Override
+        public <E extends Exception> void writeTo( AnyValueWriter<E> writer ) throws E
+        {
+            writer.beginList( values.size() );
+            for ( AnyValue value : values )
             {
-                sb.append( values[i] );
+                value.writeTo( writer );
             }
-            sb.append( '}' );
-            return sb.toString();
+            writer.endList();
+        }
+
+        @Override
+        public int size()
+        {
+            return values.size();
+        }
+
+        @Override
+        public AnyValue value( int offset )
+        {
+            return values.get( offset );
+        }
+
+        @Override
+        public AnyValue[] asArray()
+        {
+            return values.toArray( new AnyValue[values.size()] );
         }
 
         @Override
         public int hash()
         {
-            return Arrays.hashCode( values );
+            return values.hashCode();
         }
     }
 
@@ -653,6 +702,12 @@ public <E extends Exception> void writeTo( AnyValueWriter<E> writer ) throws E
 
         }
 
+        @Override
+        public String toString()
+        {
+            return "Range(" + start + "..." + end + ", step = " + step + ")";
+        }
+
         private boolean check( long current )
         {
             if ( step > 0 )
diff --git a/community/values/src/main/java/org/neo4j/values/virtual/MapValue.java b/community/values/src/main/java/org/neo4j/values/virtual/MapValue.java
index 56677349ccf75..77f19487c7411 100644
--- a/community/values/src/main/java/org/neo4j/values/virtual/MapValue.java
+++ b/community/values/src/main/java/org/neo4j/values/virtual/MapValue.java
@@ -22,6 +22,7 @@
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Map;
+import java.util.Set;
 import java.util.function.BiConsumer;
 
 import org.neo4j.values.AnyValue;
@@ -122,6 +123,11 @@ public void foreach( BiConsumer<String,AnyValue> f )
         map.forEach( f );
     }
 
+    public Set<Map.Entry<String,AnyValue>> entrySet()
+    {
+        return map.entrySet();
+    }
+
     public boolean containsKey( String key )
     {
         return map.containsKey( key );
diff --git a/community/values/src/main/java/org/neo4j/values/virtual/VirtualValues.java b/community/values/src/main/java/org/neo4j/values/virtual/VirtualValues.java
index 2cf55890d6c77..55b2700fff945 100644
--- a/community/values/src/main/java/org/neo4j/values/virtual/VirtualValues.java
+++ b/community/values/src/main/java/org/neo4j/values/virtual/VirtualValues.java
@@ -21,6 +21,7 @@
 
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
 
@@ -51,6 +52,11 @@ public static ListValue list( AnyValue... values )
         return new ListValue.ArrayListValue( values );
     }
 
+    public static ListValue fromList( List<AnyValue> values )
+    {
+        return new ListValue.JavaListListValue( values );
+    }
+
     public static ListValue range( long start, long end, long step )
     {
         return new ListValue.IntegralRangeListValue( start, end, step );
@@ -102,6 +108,41 @@ public static ListValue reverse( ListValue list )
         return new ListValue.ReversedList( list );
     }
 
+    public static ListValue concat( ListValue... lists )
+    {
+        int totalSize = 0;
+        for ( ListValue list : lists )
+        {
+            totalSize += list.size();
+        }
+
+        AnyValue[] anyValues = new AnyValue[totalSize];
+        int startPoint = 0;
+        for ( ListValue list : lists )
+        {
+            System.arraycopy( list.asArray(), 0, anyValues, startPoint, list.size() );
+            startPoint += list.size();
+        }
+
+        return VirtualValues.list( anyValues );
+    }
+
+    public static ListValue appendToList( ListValue list, AnyValue value )
+    {
+        AnyValue[] newValues = new AnyValue[list.size() + 1];
+        System.arraycopy( list.asArray(), 0, newValues, 0, list.size() );
+        newValues[list.size()] = value;
+        return VirtualValues.list( newValues );
+    }
+
+    public static ListValue prependToList( ListValue list, AnyValue value )
+    {
+        AnyValue[] newValues = new AnyValue[list.size() + 1];
+        newValues[0] = value;
+        System.arraycopy( list.asArray(), 0, newValues, 1, list.size() );
+        return VirtualValues.list( newValues );
+    }
+
     public static MapValue emptyMap()
     {
         return EMPTY_MAP;
@@ -118,6 +159,14 @@ public static MapValue map( String[] keys, AnyValue[] values )
         return new MapValue( map );
     }
 
+    public static MapValue combine( MapValue a, MapValue b )
+    {
+        HashMap<String,AnyValue> map = new HashMap<>( a.size() + b.size() );
+        a.foreach( map::put );
+        b.foreach( map::put );
+        return VirtualValues.map( map );
+    }
+
     public static MapValue map( Map<String,AnyValue> map )
     {
         return new MapValue( map );