diff --git a/README.md b/README.md
index 73375e7e6..8c121a237 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,9 @@ This repository is a top level repository which houses all source code in order
 different runtimes.
 
 This library is written in Dafny, a formally verifiable programming language that can be compiled into
-different runtimes. This library is currently **ONLY** supported in Java and .NET
+different runtimes. This library is currently **ONLY** supported in Java, .NET and Rust.
+
+<!-- TODO: Add Go to supported languages https://sim.amazon.com/issues/CrypTool-5444 -->
 
 ### AWS Integration
 
@@ -68,10 +70,11 @@ You need an Amazon Web Services (AWS) account to use the DB-ESDK for DynamoDB as
 - .NET
 - Dafny
 - Rust
+<!-- TODO: Add Go to supported languages https://sim.amazon.com/issues/CrypTool-5444 -->
 
 # Contributing
 
-See [CONTRIBUTING](CONTRIBUTING.md) for more information.
+See [CONTRIBUTING](CONTRIBUTING.md) for more information. For detailed information about code organization and development see [DynamoDbEncryption README](./DynamoDbEncryption/README.md)
 
 # License
 
diff --git a/TestVectors/README.md b/TestVectors/README.md
index aed9ae4cf..b4a5d3ab4 100644
--- a/TestVectors/README.md
+++ b/TestVectors/README.md
@@ -16,15 +16,32 @@ This validates the Database Encryption SDK's cross-version compatibility.
 
 ### Building and Running
 
-1. Start in the root `./TestVectors` directory
-2. Run `make build_java`
-3. Run `make test_java`
-4. Run `make transpile_net`
-5. Run `cd runtimes/net`
-6. Run `dotnet run --framework net6.0`
-7. Run `make transpile_rust`
-8. Run `make polymorph_rust`
-9. Run `make test_rust`
+Start in the root `./TestVectors` directory and read the runtime specific building and running instructions below.
+
+#### Java
+
+1. Run `make build_java`
+2. Run `make test_java`
+
+#### .NET
+
+1. Run `make transpile_net`
+2. Run `cp ./runtimes/java/*.json ./runtimes/net/`
+3. Run `cd runtimes/net`
+4. Run `dotnet run --framework net6.0`
+
+#### Rust
+
+1. Run `make transpile_rust`
+2. Run `cp ./runtimes/java/*.json ./runtimes/rust/`
+3. Run `make polymorph_rust`
+4. Run `make test_rust`
+
+#### Go
+
+1. Run `make transpile_go`
+2. Run `cp ./runtimes/java/*.json ./runtimes/go/`
+3. Run `make test_go`
 
 ### Saving results for later