diff --git a/code/go/example.go b/code/go/example.go
index aab89e1..13633cf 100644
--- a/code/go/example.go
+++ b/code/go/example.go
@@ -3,9 +3,9 @@
 package main
 
 import (
+	"context"
 	"fmt"
-	"github.com/neo4j/neo4j-go-driver/v4/neo4j"
-	"io"
+	"github.com/neo4j/neo4j-go-driver/v5/neo4j"
 	"reflect"
 )
 
@@ -19,46 +19,37 @@ func main() {
 	}
 }
 
-func runQuery(uri, database, username, password string) (result []string, err error) {
-	driver, err := neo4j.NewDriver(uri, neo4j.BasicAuth(username, password, ""))
+func runQuery(uri, database, username, password string) (_ []string, err error) {
+	ctx := context.Background()
+	driver, err := neo4j.NewDriverWithContext(uri, neo4j.BasicAuth(username, password, ""))
 	if err != nil {
 		return nil, err
 	}
-	defer func() {err = handleClose(driver, err)}()
-	session := driver.NewSession(neo4j.SessionConfig{AccessMode: neo4j.AccessModeRead, DatabaseName: database})
-	defer func() {err = handleClose(session, err)}()
-	results, err := session.ReadTransaction(func(transaction neo4j.Transaction) (interface{}, error) {
-		result, err := transaction.Run(
-			`
-			MATCH (a:Officer {name:$name})-[r:officer_of|intermediary_of|registered_address*..10]-(b)
-			RETURN b.name as name LIMIT 20
-			`, map[string]interface{}{
-				"name": "Ross, Jr. - Wilbur Louis",
-			})
+	defer func() { err = handleClose(ctx, driver, err) }()
+	query := "	MATCH (a:Officer {name:$name})-[r:officer_of|intermediary_of|registered_address*..10]-(b)
+	RETURN b.name as name LIMIT 20
+	params := map[string]any{"name": "Ross, Jr. - Wilbur Louis"}
+	result, err := neo4j.ExecuteQuery(ctx, driver, query, params,
+		neo4j.EagerResultTransformer,
+		neo4j.ExecuteQueryWithDatabase(database),
+		neo4j.ExecuteQueryWithReadersRouting())
+	if err != nil {
+		return nil, err
+	}
+	names := make([]string, len(result.Records))
+	for i, record := range result.Records {
+		// this assumes all actors have names, hence ignoring the 2nd returned value
+		name, _, err := neo4j.GetRecordValue[string](record, "name")
 		if err != nil {
 			return nil, err
 		}
-		var arr []string
-		for result.Next() {
-			value, found := result.Record().Get("name")
-			if found {
-				arr = append(arr, value.(string))
-			}
-		}
-		if err = result.Err(); err != nil {
-			return nil, err
-		}
-		return arr, nil
-	})
-	if err != nil {
-		return nil, err
+		names[i] = name
 	}
-	result = results.([]string)
-	return result, err
+	return names, nil
 }
 
-func handleClose(closer io.Closer, previousError error) error {
-	err := closer.Close()
+func handleClose(ctx context.Context, closer interface{ Close(context.Context) error }, previousError error) error {
+	err := closer.Close(ctx)
 	if err == nil {
 		return previousError
 	}
diff --git a/code/graphql/example.js b/code/graphql/example.js
index 7b69b9b..991ca09 100644
--- a/code/graphql/example.js
+++ b/code/graphql/example.js
@@ -45,6 +45,7 @@ type Other {
   valid_until: String!
   intermediary_of: [Entity]
     @relationship(type: "intermediary_of", direction: OUT)
+  same_name_as: [Entity] @relationship(type: "SAME_NAME_AS", direction: OUT)
 }
 
 type Intermediary {
@@ -55,6 +56,7 @@ type Intermediary {
   sourceID: String!
   valid_until: String!
   connected_to: [Entity] @relationship(type: "connected_to", direction: OUT)
+  same_name_as: [Entity] @relationship(type: "SAME_NAME_AS", direction: OUT)
 }
 
 type Officer {
@@ -69,6 +71,8 @@ type Officer {
     @relationship(type: "registered_address", direction: OUT)
   officer_of: [Entity] @relationship(type: "officer_of", direction: OUT)
   connected_to: [Entity] @relationship(type: "connected_to", direction: OUT)
+  same_name_as: [Entity] @relationship(type: "SAME_NAME_AS", direction: OUT)
+  same_id_as: [Officer] @relationship(type: "SAME_ID_AS", direction: OUT)
   num_of_connected_entities: Int
     @cypher(
       statement: """
diff --git a/code/javascript/example.js b/code/javascript/example.js
index f771186..65c44b9 100644
--- a/code/javascript/example.js
+++ b/code/javascript/example.js
@@ -3,7 +3,7 @@
 const neo4j = require('neo4j-driver');
 const driver = neo4j.driver('neo4j://<HOST>:<BOLTPORT>',
                   neo4j.auth.basic('<USERNAME>', '<PASSWORD>'), 
-                  {/* encrypted: 'ENCRYPTION_OFF' */});
+                  {});
 
 const query =
   `
diff --git a/code/python/example.py b/code/python/example.py
index 9b0cb9b..8361dc8 100644
--- a/code/python/example.py
+++ b/code/python/example.py
@@ -1,22 +1,20 @@
-# pip3 install neo4j-driver
+# pip3 install neo4j
 # python3 example.py
 
 from neo4j import GraphDatabase, basic_auth
 
-driver = GraphDatabase.driver(
-  "neo4j://<HOST>:<BOLTPORT>",
-  auth=basic_auth("<USERNAME>", "<PASSWORD>"))
-
 cypher_query = '''
 MATCH (a:Officer {name:$name})-[r:officer_of|intermediary_of|registered_address*..10]-(b)
 RETURN b.name as name LIMIT 20
 '''
 
-with driver.session(database="neo4j") as session:
-  results = session.read_transaction(
-    lambda tx: tx.run(cypher_query,
-                      name="Ross, Jr. - Wilbur Louis").data())
-  for record in results:
-    print(record['name'])
-
-driver.close()
+with GraphDatabase.driver(
+    "neo4j://<HOST>:<BOLTPORT>",
+    auth=("<USERNAME>", "<PASSWORD>")
+) as driver:
+    result = driver.execute_query(
+        cypher_query,
+        name="Ross, Jr. - Wilbur Louis",
+        database_="neo4j")
+    for record in result.records:
+        print(record['name'])