diff --git a/.github/workflows/continuous-integration-legacy.yaml b/.github/workflows/continuous-integration-legacy.yaml
index 23e7915e1ca..a52fb2d62bf 100644
--- a/.github/workflows/continuous-integration-legacy.yaml
+++ b/.github/workflows/continuous-integration-legacy.yaml
@@ -24,7 +24,7 @@ jobs:
           - name: Accumulo
             values: :accumulo-store,:accumulo-rest
           - name: Federated-And-Map
-            values: :integration-test,:federated-store,:map-store,:map-rest
+            values: :integration-test,:federated-store,:map-store,:map-rest,:simple-federated-store
           - name: REST
             values: :rest-api,:common-rest,:spring-rest,:core-rest,:store-implementation,:proxy-store
           - name: Examples
diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml
index b454c1a0e6e..c5ef87ff746 100644
--- a/.github/workflows/continuous-integration.yaml
+++ b/.github/workflows/continuous-integration.yaml
@@ -94,7 +94,7 @@ jobs:
           - name: Accumulo
             values: :accumulo-store,:accumulo-rest
           - name: Federated-And-Map
-            values: :integration-test,:federated-store,:map-store,:map-rest
+            values: :integration-test,:federated-store,:map-store,:map-rest,:simple-federated-store
           - name: REST
             values: :rest-api,:common-rest,:spring-rest,:core-rest,:store-implementation,:proxy-store
           - name: Examples
diff --git a/core/common-util/src/main/java/uk/gov/gchq/gaffer/commonutil/OneOrMore.java b/core/common-util/src/main/java/uk/gov/gchq/gaffer/commonutil/OneOrMore.java
index cce539bc1f0..0176408e4ad 100644
--- a/core/common-util/src/main/java/uk/gov/gchq/gaffer/commonutil/OneOrMore.java
+++ b/core/common-util/src/main/java/uk/gov/gchq/gaffer/commonutil/OneOrMore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 Crown Copyright
+ * Copyright 2017-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -117,14 +117,10 @@ public void removeAnyItem() {
     }
 
     public int size() {
-        if (null == collection) {
-            if (null != singleItem) {
-                return 1;
-            }
-            return 0;
+        if (collection != null) {
+            return collection.size();
         }
-
-        return collection.size();
+        return (singleItem != null) ? 1 : 0;
     }
 
     public boolean isEmpty() {
diff --git a/core/common-util/src/main/java/uk/gov/gchq/gaffer/commonutil/elementvisibilityutil/ElementVisibility.java b/core/common-util/src/main/java/uk/gov/gchq/gaffer/commonutil/elementvisibilityutil/ElementVisibility.java
index b954604dbea..809e1ca4b3b 100644
--- a/core/common-util/src/main/java/uk/gov/gchq/gaffer/commonutil/elementvisibilityutil/ElementVisibility.java
+++ b/core/common-util/src/main/java/uk/gov/gchq/gaffer/commonutil/elementvisibilityutil/ElementVisibility.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 Crown Copyright
+ * Copyright 2017-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,6 +39,11 @@ public class ElementVisibility {
         EMPTY_NODE = new ElementVisibility.Node(ElementVisibility.NodeType.EMPTY, 0);
     }
 
+    public ElementVisibility(final Object expression) {
+        this.node = null;
+        this.validate(convert(expression));
+    }
+
     public ElementVisibility(final String expression) {
         this(expression.getBytes(UTF_8));
     }
@@ -48,6 +53,10 @@ public ElementVisibility(final byte[] expression) {
         this.validate(expression);
     }
 
+    private byte[] convert(final Object expression) {
+        return expression.toString().getBytes(UTF_8);
+    }
+
     public byte[] getExpression() {
         return this.expression;
     }
diff --git a/core/common-util/src/main/java/uk/gov/gchq/gaffer/commonutil/iterable/LimitedInMemorySortedIterable.java b/core/common-util/src/main/java/uk/gov/gchq/gaffer/commonutil/iterable/LimitedInMemorySortedIterable.java
index 48e54eff07e..8668b09e002 100644
--- a/core/common-util/src/main/java/uk/gov/gchq/gaffer/commonutil/iterable/LimitedInMemorySortedIterable.java
+++ b/core/common-util/src/main/java/uk/gov/gchq/gaffer/commonutil/iterable/LimitedInMemorySortedIterable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 Crown Copyright
+ * Copyright 2017-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -86,20 +86,28 @@ public boolean add(final E e) {
         boolean result = false;
 
         final OneOrMore<E> values = backingMap.get(e);
-        // Skip the item if we are deduplicating and the item already exists
+        // Skip the item if we are deduplicating and the item already exists.
         boolean skipItem = (deduplicate && nonNull(values) && values.contains(e));
         if (!skipItem) {
             if (nonNull(limit) && size >= limit) {
                 // Check the item against the last item.
                 final Map.Entry<E, OneOrMore<E>> last = backingMap.lastEntry();
+                // Checks if the last items key is greater than e
                 if (0 < comparator.compare(last.getKey(), e)) {
+                    // Checks if the items value contains a collection or a single item
                     if (1 < last.getValue().size()) {
+                        // Items value contains a collection.
+                        // Remove item from collection.
                         last.getValue().removeAnyItem();
                     } else {
+                        // Items value contains a single item.
+                        // Remove item from backingMap.
                         backingMap.remove(last.getKey());
                     }
                     size--;
+                    // e is bigger than the lastEntry.
                 } else {
+                    // Skip adding the item.
                     skipItem = true;
                 }
             }
diff --git a/core/common-util/src/main/java/uk/gov/gchq/gaffer/commonutil/otel/OtelUtil.java b/core/common-util/src/main/java/uk/gov/gchq/gaffer/commonutil/otel/OtelUtil.java
index 6d33b65647d..7cf3e93ab11 100644
--- a/core/common-util/src/main/java/uk/gov/gchq/gaffer/commonutil/otel/OtelUtil.java
+++ b/core/common-util/src/main/java/uk/gov/gchq/gaffer/commonutil/otel/OtelUtil.java
@@ -21,6 +21,12 @@
 
 public final class OtelUtil {
 
+    public static final String USER_ATTRIBUTE = "enduser.id";
+    public static final String JOB_ID_ATTRIBUTE = "gaffer.jobId";
+    public static final String GRAPH_ID_ATTRIBUTE = "gaffer.graphId";
+    public static final String VIEW_ATTRIBUTE = "gaffer.view";
+    public static final String GREMLIN_QUERY_ATTRIBUTE = "gaffer.gremlin.query";
+
     private static boolean openTelemetryActive = false;
 
     private OtelUtil() {
diff --git a/core/common-util/src/test/java/uk/gov/gchq/gaffer/commonutil/OneOrMoreTest.java b/core/common-util/src/test/java/uk/gov/gchq/gaffer/commonutil/OneOrMoreTest.java
index c2a73896a78..d6e49ef708b 100644
--- a/core/common-util/src/test/java/uk/gov/gchq/gaffer/commonutil/OneOrMoreTest.java
+++ b/core/common-util/src/test/java/uk/gov/gchq/gaffer/commonutil/OneOrMoreTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 Crown Copyright
+ * Copyright 2017-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
 import java.util.stream.IntStream;
 
 import static org.assertj.core.api.Assertions.assertThat;
-
 public class OneOrMoreTest {
 
     @Test
@@ -72,6 +71,32 @@ public void shouldRemoveLastItemInList() {
                 .containsExactly(1, 2);
     }
 
+    @Test
+    void testSizeWithNonNullCollection() {
+        final boolean deduplicate = true;
+        final OneOrMore<Integer> collection = new OneOrMore<>(deduplicate, 1);
+        collection.add(2);
+        collection.add(3);
+
+        assertThat(collection).hasSize(3);
+    }
+
+    @Test
+    void testSizeWithSingleItem() {
+        final boolean deduplicate = true;
+        final OneOrMore<Integer> collection = new OneOrMore<>(deduplicate, 1);
+
+        assertThat(collection).hasSize(1);
+    }
+
+    @Test
+    void testSizeWithNullCollectionAndSingleItem() {
+        final boolean deduplicate = true;
+        final OneOrMore<Integer> collection = new OneOrMore<>(deduplicate, null);
+
+        assertThat(collection).isEmpty();
+    }
+
     @Test
     public void shouldAddItemsWithoutDeduplicate() {
         // Given
diff --git a/core/common-util/src/test/java/uk/gov/gchq/gaffer/commonutil/elementvisibilityutil/ElementVisibilityTest.java b/core/common-util/src/test/java/uk/gov/gchq/gaffer/commonutil/elementvisibilityutil/ElementVisibilityTest.java
index 40422e88ea0..a05d99c953d 100644
--- a/core/common-util/src/test/java/uk/gov/gchq/gaffer/commonutil/elementvisibilityutil/ElementVisibilityTest.java
+++ b/core/common-util/src/test/java/uk/gov/gchq/gaffer/commonutil/elementvisibilityutil/ElementVisibilityTest.java
@@ -31,6 +31,19 @@
 
 class ElementVisibilityTest {
 
+    @Test
+    void testIntegerTypeIsAccepted() {
+        final ElementVisibility ev = new ElementVisibility(1);
+        assertThat(ev).hasToString("[1]");
+    }
+
+    @Test
+    void testCustomObjectIsAccepted() {
+        RandomObject randomObject = new RandomObject("Hello", 1);
+        final ElementVisibility ev = new ElementVisibility(randomObject);
+        assertThat(ev).hasToString("[hello]");
+    }
+
     @Test
     void testEmptyStringIsValid() {
         final ElementVisibility a = new ElementVisibility(new byte[0]);
@@ -188,4 +201,19 @@ private void assertNode(final ElementVisibility.Node node, final ElementVisibili
                 }
         );
     }
+
+    class RandomObject {
+        private String randomString;
+        private Integer randomInteger;
+
+        RandomObject(String randomString, Integer randomInteger) {
+            this.randomString = randomString;
+            this.randomInteger = randomInteger;
+        }
+
+        @Override
+        public String toString() {
+            return "hello";
+        }
+    }
 }
diff --git a/core/common-util/src/test/java/uk/gov/gchq/gaffer/commonutil/iterable/LimitedInMemorySortedIterableTest.java b/core/common-util/src/test/java/uk/gov/gchq/gaffer/commonutil/iterable/LimitedInMemorySortedIterableTest.java
index a5cd7b2c670..d53b42165f1 100644
--- a/core/common-util/src/test/java/uk/gov/gchq/gaffer/commonutil/iterable/LimitedInMemorySortedIterableTest.java
+++ b/core/common-util/src/test/java/uk/gov/gchq/gaffer/commonutil/iterable/LimitedInMemorySortedIterableTest.java
@@ -90,6 +90,18 @@ void shouldLimitAndNotDeduplicateEntries() {
         assertThat(list).containsExactly(1, 1, 2, 2);
     }
 
+    @Test
+    void shouldInsertNewItemAndRemoveOldItemWhenlimitIsReachedAndNewItemIsLessThanLastEntry() {
+        final LimitedInMemorySortedIterable<Integer> list = new LimitedInMemorySortedIterable<Integer>(Comparator.naturalOrder(), 3, false);
+
+        list.add(3);
+        list.add(2);
+        list.add(3);
+        list.add(2);
+
+        assertThat(list).hasSize(3).containsExactly(2, 2, 3);
+    }
+
     @Test
     void shouldAddAll() {
         final LimitedInMemorySortedIterable<Integer> itr = new LimitedInMemorySortedIterable<Integer>(Comparator.naturalOrder(), 100);
diff --git a/core/graph/src/main/java/uk/gov/gchq/gaffer/graph/Graph.java b/core/graph/src/main/java/uk/gov/gchq/gaffer/graph/Graph.java
index 34fa107db63..02d616b425a 100644
--- a/core/graph/src/main/java/uk/gov/gchq/gaffer/graph/Graph.java
+++ b/core/graph/src/main/java/uk/gov/gchq/gaffer/graph/Graph.java
@@ -321,9 +321,9 @@ private <O> GraphResult<O> _execute(final StoreExecuter<O> storeExecuter, final
         Span span = OtelUtil.startSpan(
             this.getClass().getName(),
             "Graph Request: " + clonedOpChain.toOverviewString());
-        span.setAttribute("gaffer.graphId", getGraphId());
-        span.setAttribute("gaffer.jobId", clonedContext.getJobId());
-        span.setAttribute("gaffer.user", clonedContext.getUser().getUserId());
+        span.setAttribute(OtelUtil.GRAPH_ID_ATTRIBUTE, getGraphId());
+        span.setAttribute(OtelUtil.JOB_ID_ATTRIBUTE, clonedContext.getJobId());
+        span.setAttribute(OtelUtil.USER_ATTRIBUTE, clonedContext.getUser().getUserId());
 
         O result = null;
         // Sets the span to current so parent child spans are auto linked
@@ -520,6 +520,10 @@ public GraphLibrary getGraphLibrary() {
         return store.getCaches();
     }
 
+    public String getCreatedTime() {
+        return store.getCreatedTime();
+    }
+
     @FunctionalInterface
     private interface StoreExecuter<O> {
         O execute(final OperationChain<O> operation, final Context context) throws OperationException;
diff --git a/core/graph/src/main/java/uk/gov/gchq/gaffer/graph/hook/NamedOperationResolver.java b/core/graph/src/main/java/uk/gov/gchq/gaffer/graph/hook/NamedOperationResolver.java
index 0c8a98f9741..9eec1359a3c 100644
--- a/core/graph/src/main/java/uk/gov/gchq/gaffer/graph/hook/NamedOperationResolver.java
+++ b/core/graph/src/main/java/uk/gov/gchq/gaffer/graph/hook/NamedOperationResolver.java
@@ -128,6 +128,7 @@ private Collection<Operation> resolveNamedOperations(final Operation operation,
                         .getOperationChain(namedOperation.getParameters());
                 // Update the operation inputs and add operation chain to the updated list
                 OperationHandlerUtil.updateOperationInput(namedOperationChain, namedOperation.getInput());
+                namedOperationChain.setOptions(namedOperation.getOptions());
 
                 // Run again to resolve any nested operations in the chain before adding
                 namedOperationChain.updateOperations(resolveNamedOperations(namedOperationChain, user, depth + 1));
diff --git a/core/graph/src/test/java/uk/gov/gchq/gaffer/graph/GraphTest.java b/core/graph/src/test/java/uk/gov/gchq/gaffer/graph/GraphTest.java
index 1b2cb76f6a7..ae42ec9d588 100644
--- a/core/graph/src/test/java/uk/gov/gchq/gaffer/graph/GraphTest.java
+++ b/core/graph/src/test/java/uk/gov/gchq/gaffer/graph/GraphTest.java
@@ -81,6 +81,7 @@
 import uk.gov.gchq.gaffer.store.TestTypes;
 import uk.gov.gchq.gaffer.store.library.GraphLibrary;
 import uk.gov.gchq.gaffer.store.library.HashMapGraphLibrary;
+import uk.gov.gchq.gaffer.store.operation.DeleteAllData;
 import uk.gov.gchq.gaffer.store.operation.GetTraits;
 import uk.gov.gchq.gaffer.store.operation.handler.GetTraitsHandler;
 import uk.gov.gchq.gaffer.store.operation.handler.OperationHandler;
@@ -104,6 +105,8 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -117,6 +120,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+import static org.assertj.core.api.Assertions.within;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -2687,6 +2691,31 @@ public void shouldNotExpandGlobalEdgesWhereNotPresentInSchema(@Mock final Store
         assertNotNull(mergedView.getGlobalEdges().get(0).getPostAggregationFilter());
 
     }
+    @Test
+    void shouldGetGraphCreatedTime() {
+        // Given
+        final Store store = new TestStoreImpl();
+        final Schema schema = new Schema.Builder().build();
+        Graph graph = new Graph.Builder()
+        .config(new GraphConfig.Builder()
+                .graphId(GRAPH_ID)
+                .build())
+        .storeProperties(StreamUtil.storeProps(getClass()))
+        .store(store)
+        .addSchema(schema)
+        .build();
+
+        // When
+        String graphCreatedTime = graph.getCreatedTime();
+
+        // Then
+        assertThat(graphCreatedTime)
+                .isNotNull()
+                .isInstanceOf(String.class);
+        assertThat(LocalDateTime.parse(graphCreatedTime))
+                .isInstanceOf(LocalDateTime.class)
+                .isCloseTo(LocalDateTime.now(), within(20, ChronoUnit.SECONDS));
+    }
 
     public static class TestStoreImpl extends Store {
         @Override
@@ -2719,6 +2748,11 @@ protected OperationHandler<? extends DeleteElements> getDeleteElementsHandler()
             return null;
         }
 
+        @Override
+        protected OperationHandler<DeleteAllData> getDeleteAllDataHandler() {
+            return null;
+        }
+
         @Override
         protected OutputOperationHandler<GetTraits, Set<StoreTrait>> getGetTraitsHandler() {
             return new GetTraitsHandler(new HashSet<>(0));
diff --git a/core/graph/src/test/java/uk/gov/gchq/gaffer/integration/store/TestStore.java b/core/graph/src/test/java/uk/gov/gchq/gaffer/integration/store/TestStore.java
index e98525a75d9..7a3180ee22d 100644
--- a/core/graph/src/test/java/uk/gov/gchq/gaffer/integration/store/TestStore.java
+++ b/core/graph/src/test/java/uk/gov/gchq/gaffer/integration/store/TestStore.java
@@ -32,6 +32,7 @@
 import uk.gov.gchq.gaffer.store.Context;
 import uk.gov.gchq.gaffer.store.Store;
 import uk.gov.gchq.gaffer.store.StoreTrait;
+import uk.gov.gchq.gaffer.store.operation.DeleteAllData;
 import uk.gov.gchq.gaffer.store.operation.GetTraits;
 import uk.gov.gchq.gaffer.store.operation.handler.GetTraitsHandler;
 import uk.gov.gchq.gaffer.store.operation.handler.OperationHandler;
@@ -89,6 +90,11 @@ protected OperationHandler<? extends DeleteElements> getDeleteElementsHandler()
         return null;
     }
 
+    @Override
+    protected OperationHandler<DeleteAllData> getDeleteAllDataHandler() {
+        return null;
+    }
+
     @Override
     protected OutputOperationHandler<GetTraits, Set<StoreTrait>> getGetTraitsHandler() {
         return mock(GetTraitsHandler.class);
diff --git a/core/operation/src/main/java/uk/gov/gchq/gaffer/operation/data/EdgeSeed.java b/core/operation/src/main/java/uk/gov/gchq/gaffer/operation/data/EdgeSeed.java
index 01d46c8fa89..e4a798fa8bf 100644
--- a/core/operation/src/main/java/uk/gov/gchq/gaffer/operation/data/EdgeSeed.java
+++ b/core/operation/src/main/java/uk/gov/gchq/gaffer/operation/data/EdgeSeed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Crown Copyright
+ * Copyright 2016-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/core/operation/src/main/java/uk/gov/gchq/gaffer/operation/impl/get/GetGraphCreatedTime.java b/core/operation/src/main/java/uk/gov/gchq/gaffer/operation/impl/get/GetGraphCreatedTime.java
new file mode 100644
index 00000000000..5806ea06ccb
--- /dev/null
+++ b/core/operation/src/main/java/uk/gov/gchq/gaffer/operation/impl/get/GetGraphCreatedTime.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.operation.impl.get;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.core.type.TypeReference;
+import org.apache.commons.lang3.exception.CloneFailedException;
+
+import uk.gov.gchq.gaffer.operation.Operation;
+import uk.gov.gchq.gaffer.operation.io.Output;
+import uk.gov.gchq.koryphe.Since;
+import uk.gov.gchq.koryphe.Summary;
+
+import java.util.Map;
+
+@Since("2.3.1")
+@Summary("Operation to retrieve Graph created date")
+@JsonPropertyOrder(alphabetic = true)
+public class GetGraphCreatedTime implements Output<Map<String, String>> {
+    private Map<String, String> options;
+
+    @Override
+    public Operation shallowClone() throws CloneFailedException {
+        return new Builder()
+                .options(options)
+                .build();
+    }
+
+    @Override
+    public Map<String, String> getOptions() {
+        return options;
+    }
+
+    @Override
+    public void setOptions(final Map<String, String> options) {
+        this.options = options;
+    }
+
+    @Override
+    public TypeReference<Map<String, String>> getOutputTypeReference() {
+        return new TypeReference<Map<String, String>>() { };
+
+    }
+
+    public static class Builder extends Operation.BaseBuilder<GetGraphCreatedTime, Builder> implements Output.Builder<GetGraphCreatedTime, Map<String, String>, Builder> {
+        public Builder() {
+            super(new GetGraphCreatedTime());
+        }
+
+    }
+}
diff --git a/core/operation/src/main/java/uk/gov/gchq/gaffer/operation/serialisation/TypeReferenceImpl.java b/core/operation/src/main/java/uk/gov/gchq/gaffer/operation/serialisation/TypeReferenceImpl.java
index a5028f67503..b0b8562f2cb 100644
--- a/core/operation/src/main/java/uk/gov/gchq/gaffer/operation/serialisation/TypeReferenceImpl.java
+++ b/core/operation/src/main/java/uk/gov/gchq/gaffer/operation/serialisation/TypeReferenceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Crown Copyright
+ * Copyright 2016-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -95,6 +95,8 @@ public static class Map extends TypeReference<java.util.LinkedHashMap> {
     public static class MapStringObject extends TypeReference<java.util.Map<java.lang.String, java.lang.Object>> {
     }
 
+    public static class MapStringString extends TypeReference<java.util.Map<java.lang.String, java.lang.String>> {
+    }
     public static class MapStringSet extends TypeReference<java.util.Map<java.lang.String, java.util.Set<java.lang.Object>>> {
     }
 
diff --git a/core/operation/src/test/java/uk/gov/gchq/gaffer/operation/impl/get/GetGraphCreatedTimeTest.java b/core/operation/src/test/java/uk/gov/gchq/gaffer/operation/impl/get/GetGraphCreatedTimeTest.java
new file mode 100644
index 00000000000..6bb5cb5bcb4
--- /dev/null
+++ b/core/operation/src/test/java/uk/gov/gchq/gaffer/operation/impl/get/GetGraphCreatedTimeTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.operation.impl.get;
+
+import org.junit.jupiter.api.Test;
+
+import uk.gov.gchq.gaffer.operation.Operation;
+import uk.gov.gchq.gaffer.operation.OperationTest;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class GetGraphCreatedTimeTest extends OperationTest<GetGraphCreatedTime> {
+
+    @Test
+    public void builderShouldCreatePopulatedOperation() {
+        final GetGraphCreatedTime op = new GetGraphCreatedTime();
+
+        assertThat(op).isInstanceOf(GetGraphCreatedTime.class);
+    }
+
+    protected GetGraphCreatedTime getTestObject() {
+        return new GetGraphCreatedTime();
+    }
+
+    @Test
+    public void shouldShallowCloneOperation() {
+        // Given
+        final GetGraphCreatedTime getGraphCreatedTime = new GetGraphCreatedTime();
+
+        // When
+        final Operation clone = getGraphCreatedTime.shallowClone();
+
+        // Then
+        assertThat(clone).isNotSameAs(getGraphCreatedTime);
+    }
+}
diff --git a/core/store/src/main/java/uk/gov/gchq/gaffer/store/Store.java b/core/store/src/main/java/uk/gov/gchq/gaffer/store/Store.java
index a48fb54480f..d153548bacd 100644
--- a/core/store/src/main/java/uk/gov/gchq/gaffer/store/Store.java
+++ b/core/store/src/main/java/uk/gov/gchq/gaffer/store/Store.java
@@ -79,6 +79,7 @@
 import uk.gov.gchq.gaffer.operation.impl.get.GetAdjacentIds;
 import uk.gov.gchq.gaffer.operation.impl.get.GetAllElements;
 import uk.gov.gchq.gaffer.operation.impl.get.GetElements;
+import uk.gov.gchq.gaffer.operation.impl.get.GetGraphCreatedTime;
 import uk.gov.gchq.gaffer.operation.impl.job.CancelScheduledJob;
 import uk.gov.gchq.gaffer.operation.impl.job.GetAllJobDetails;
 import uk.gov.gchq.gaffer.operation.impl.job.GetJobDetails;
@@ -98,6 +99,7 @@
 import uk.gov.gchq.gaffer.serialisation.Serialiser;
 import uk.gov.gchq.gaffer.store.library.GraphLibrary;
 import uk.gov.gchq.gaffer.store.library.NoGraphLibrary;
+import uk.gov.gchq.gaffer.store.operation.DeleteAllData;
 import uk.gov.gchq.gaffer.store.operation.GetSchema;
 import uk.gov.gchq.gaffer.store.operation.GetTraits;
 import uk.gov.gchq.gaffer.store.operation.HasTrait;
@@ -113,6 +115,7 @@
 import uk.gov.gchq.gaffer.store.operation.handler.CountHandler;
 import uk.gov.gchq.gaffer.store.operation.handler.DiscardOutputHandler;
 import uk.gov.gchq.gaffer.store.operation.handler.ForEachHandler;
+import uk.gov.gchq.gaffer.store.operation.handler.GetGraphCreatedTimeHandler;
 import uk.gov.gchq.gaffer.store.operation.handler.GetSchemaHandler;
 import uk.gov.gchq.gaffer.store.operation.handler.GetVariableHandler;
 import uk.gov.gchq.gaffer.store.operation.handler.GetVariablesHandler;
@@ -173,6 +176,7 @@
 import uk.gov.gchq.koryphe.ValidationResult;
 import uk.gov.gchq.koryphe.util.ReflectionUtil;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -212,6 +216,7 @@ public abstract class Store {
     protected final OperationChainValidator opChainValidator;
     private final SchemaOptimiser schemaOptimiser;
     private final Boolean addCoreOpHandlers;
+    private final LocalDateTime createdTime = LocalDateTime.now();
 
     /**
      * The schema - contains the type of {@link uk.gov.gchq.gaffer.data.element.Element}s
@@ -312,6 +317,14 @@ public void initialise(final String graphId, final Schema schema, final StorePro
             }
         }
     }
+    /**
+     * Gets this Store's creation timestamp for {@link GetGraphCreatedTime} operation.
+     *
+     * @return the Store's creation timestamp.
+     */
+    public String getCreatedTime() {
+        return createdTime.toString();
+    }
 
     private void rescheduleJob(final JobDetail jobDetail) {
 
@@ -896,6 +909,14 @@ public List<OperationChainOptimiser> getOperationChainOptimisers() {
      */
     protected abstract OperationHandler<? extends DeleteElements> getDeleteElementsHandler();
 
+    /**
+     * Get this Store's implementation of the handler for {@link uk.gov.gchq.gaffer.operation.DeleteAllData}.
+     * All Stores must implement this.
+     *
+     * @return the implementation of the handler for {@link uk.gov.gchq.gaffer.operation.DeleteAllData}
+     */
+    protected abstract OperationHandler<DeleteAllData> getDeleteAllDataHandler();
+
     /**
      * Get this Store's implementation of the handler for {@link uk.gov.gchq.gaffer.store.operation.GetTraits}.
      * All Stores must implement this.
@@ -1017,6 +1038,9 @@ private void addCoreOpHandlers() {
         // Delete elements
         addOperationHandler(DeleteElements.class, getDeleteElementsHandler());
 
+        // Delete all data
+        addOperationHandler(DeleteAllData.class, getDeleteAllDataHandler());
+
         // Get Elements
         addOperationHandler(GetElements.class, getGetElementsHandler());
 
@@ -1097,6 +1121,8 @@ private void addCoreOpHandlers() {
         addOperationHandler(ToSingletonList.class, new ToSingletonListHandler());
         addOperationHandler(Reduce.class, new ReduceHandler());
         addOperationHandler(Join.class, new JoinHandler());
+        addOperationHandler(GetGraphCreatedTime.class, new GetGraphCreatedTimeHandler());
+
 
         // Context variables
         addOperationHandler(SetVariable.class, new SetVariableHandler());
diff --git a/core/store/src/main/java/uk/gov/gchq/gaffer/store/library/GraphLibrary.java b/core/store/src/main/java/uk/gov/gchq/gaffer/store/library/GraphLibrary.java
index b58a463b5a4..6ed865adf4f 100644
--- a/core/store/src/main/java/uk/gov/gchq/gaffer/store/library/GraphLibrary.java
+++ b/core/store/src/main/java/uk/gov/gchq/gaffer/store/library/GraphLibrary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 Crown Copyright
+ * Copyright 2017-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@
  * A {@code GraphLibrary} stores a graphId and its related Schema and StoreProperties.
  */
 public abstract class GraphLibrary {
-    protected static final Pattern ID_ALLOWED_CHARACTERS = Pattern.compile("[a-zA-Z0-9_]*");
+    protected static final Pattern ID_ALLOWED_CHARACTERS = Pattern.compile("\\w*");
     public static final String A_GRAPH_LIBRARY_CAN_T_BE_ADDED_WITH_A_NULL_S_GRAPH_ID_S = "A GraphLibrary can't be added with a null %s, graphId: %s";
 
     public abstract void initialise(final String path);
diff --git a/core/store/src/main/java/uk/gov/gchq/gaffer/store/operation/handler/GetGraphCreatedTimeHandler.java b/core/store/src/main/java/uk/gov/gchq/gaffer/store/operation/handler/GetGraphCreatedTimeHandler.java
new file mode 100644
index 00000000000..081cd98aaca
--- /dev/null
+++ b/core/store/src/main/java/uk/gov/gchq/gaffer/store/operation/handler/GetGraphCreatedTimeHandler.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.store.operation.handler;
+
+import uk.gov.gchq.gaffer.operation.OperationException;
+import uk.gov.gchq.gaffer.operation.impl.get.GetGraphCreatedTime;
+import uk.gov.gchq.gaffer.store.Context;
+import uk.gov.gchq.gaffer.store.Store;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+  * A {@code GetGraphCreatedTimeHandler} handles {@link GetGraphCreatedTime} operations.
+  */
+ public class GetGraphCreatedTimeHandler implements OperationHandler<GetGraphCreatedTime> {
+     @Override
+     public Map<String, String> doOperation(final GetGraphCreatedTime operation, final Context context, final Store store)
+             throws OperationException {
+        Map<String, String> timestamps = new HashMap<>();
+        timestamps.put(store.getGraphId(), store.getCreatedTime());
+
+        return timestamps;
+     }
+ }
diff --git a/core/store/src/main/java/uk/gov/gchq/gaffer/store/operation/handler/OperationChainHandler.java b/core/store/src/main/java/uk/gov/gchq/gaffer/store/operation/handler/OperationChainHandler.java
index ba0cd9bfc48..f866460215e 100644
--- a/core/store/src/main/java/uk/gov/gchq/gaffer/store/operation/handler/OperationChainHandler.java
+++ b/core/store/src/main/java/uk/gov/gchq/gaffer/store/operation/handler/OperationChainHandler.java
@@ -23,6 +23,7 @@
 import uk.gov.gchq.gaffer.operation.Operation;
 import uk.gov.gchq.gaffer.operation.OperationChain;
 import uk.gov.gchq.gaffer.operation.OperationException;
+import uk.gov.gchq.gaffer.operation.graph.OperationView;
 import uk.gov.gchq.gaffer.store.Context;
 import uk.gov.gchq.gaffer.store.Store;
 import uk.gov.gchq.gaffer.store.operation.OperationChainValidator;
@@ -51,7 +52,11 @@ public OUT doOperation(final OperationChain<OUT> operationChain, final Context c
         for (final Operation op : preparedOperationChain.getOperations()) {
             // OpenTelemetry hooks
             Span span = OtelUtil.startSpan(this.getClass().getName(), op.getClass().getName());
-            span.setAttribute("jobId", context.getJobId());
+            span.setAttribute(OtelUtil.JOB_ID_ATTRIBUTE, context.getJobId());
+            if (op instanceof OperationView && ((OperationView) op).getView() != null) {
+                span.setAttribute(OtelUtil.VIEW_ATTRIBUTE, ((OperationView) op).getView().toString());
+            }
+
             // Sets the span to current so parent child spans are auto linked
             try (Scope scope = span.makeCurrent()) {
                 updateOperationInput(op, result);
diff --git a/core/store/src/test/java/uk/gov/gchq/gaffer/store/StoreTest.java b/core/store/src/test/java/uk/gov/gchq/gaffer/store/StoreTest.java
index 2eaafd8c112..c01e7241d8c 100644
--- a/core/store/src/test/java/uk/gov/gchq/gaffer/store/StoreTest.java
+++ b/core/store/src/test/java/uk/gov/gchq/gaffer/store/StoreTest.java
@@ -92,6 +92,7 @@
 import uk.gov.gchq.gaffer.operation.impl.get.GetAdjacentIds;
 import uk.gov.gchq.gaffer.operation.impl.get.GetAllElements;
 import uk.gov.gchq.gaffer.operation.impl.get.GetElements;
+import uk.gov.gchq.gaffer.operation.impl.get.GetGraphCreatedTime;
 import uk.gov.gchq.gaffer.operation.impl.job.CancelScheduledJob;
 import uk.gov.gchq.gaffer.operation.impl.job.GetAllJobDetails;
 import uk.gov.gchq.gaffer.operation.impl.job.GetJobDetails;
@@ -112,6 +113,7 @@
 import uk.gov.gchq.gaffer.serialisation.implementation.tostring.StringToStringSerialiser;
 import uk.gov.gchq.gaffer.store.Store.ScheduledJobRunnable;
 import uk.gov.gchq.gaffer.store.library.GraphLibrary;
+import uk.gov.gchq.gaffer.store.operation.DeleteAllData;
 import uk.gov.gchq.gaffer.store.operation.GetSchema;
 import uk.gov.gchq.gaffer.store.operation.GetTraits;
 import uk.gov.gchq.gaffer.store.operation.HasTrait;
@@ -139,6 +141,7 @@
 
 import java.lang.reflect.Field;
 import java.nio.charset.StandardCharsets;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -603,6 +606,7 @@ public void shouldReturnAllSupportedOperationsWhenJobTrackerIsEnabled(@Mock fina
                         ForEach.class,
                         Reduce.class,
                         CancelScheduledJob.class,
+                        GetGraphCreatedTime.class,
 
                         // Function
                         Filter.class,
@@ -711,6 +715,7 @@ public void shouldReturnAllSupportedOperationsWhenJobTrackerIsDisabled(@Mock fin
                         ToSingletonList.class,
                         ForEach.class,
                         Reduce.class,
+                        GetGraphCreatedTime.class,
 
                         // Function
                         Filter.class,
@@ -916,6 +921,19 @@ public void shouldSetAndGetGraphLibrary(@Mock final GraphLibrary graphLibrary) {
         assertThat(result).isSameAs(graphLibrary);
     }
 
+    @Test
+    void shouldGetCreatedTime() {
+        // Given
+        final Store testStore = new StoreImpl();
+
+        // When
+        String storeTime = testStore.getCreatedTime();
+
+        // Then
+        assertThat(storeTime).isInstanceOf(String.class);
+        assertThat(LocalDateTime.parse(storeTime)).isInstanceOf(LocalDateTime.class);
+    }
+
     private Schema createSchemaMock() {
         final Schema schema = mock(Schema.class);
         given(schema.validate()).willReturn(new ValidationResult());
@@ -1175,6 +1193,11 @@ protected OperationHandler<? extends DeleteElements> getDeleteElementsHandler()
             return null;
         }
 
+        @Override
+        protected OperationHandler<DeleteAllData> getDeleteAllDataHandler() {
+            return null;
+        }
+
         @Override
         protected OutputOperationHandler<GetTraits, Set<StoreTrait>> getGetTraitsHandler() {
             return new GetTraitsHandler(traits);
@@ -1271,6 +1294,11 @@ protected OperationHandler<? extends DeleteElements> getDeleteElementsHandler()
             return null;
         }
 
+        @Override
+        protected OperationHandler<DeleteAllData> getDeleteAllDataHandler() {
+            return null;
+        }
+
         @Override
         protected OutputOperationHandler<GetTraits, Set<StoreTrait>> getGetTraitsHandler() {
             return new GetTraitsHandler(traits);
@@ -1376,6 +1404,11 @@ protected OperationHandler<? extends DeleteElements> getDeleteElementsHandler()
             return null;
         }
 
+        @Override
+        protected OperationHandler<DeleteAllData> getDeleteAllDataHandler() {
+            return null;
+        }
+
         @Override
         protected OutputOperationHandler<GetTraits, Set<StoreTrait>> getGetTraitsHandler() {
             return new GetTraitsHandler(traits);
diff --git a/core/store/src/test/java/uk/gov/gchq/gaffer/store/integration/StoreIT.java b/core/store/src/test/java/uk/gov/gchq/gaffer/store/integration/StoreIT.java
index c95bb45a202..64f4d663311 100644
--- a/core/store/src/test/java/uk/gov/gchq/gaffer/store/integration/StoreIT.java
+++ b/core/store/src/test/java/uk/gov/gchq/gaffer/store/integration/StoreIT.java
@@ -36,6 +36,7 @@
 import uk.gov.gchq.gaffer.store.StoreException;
 import uk.gov.gchq.gaffer.store.StoreProperties;
 import uk.gov.gchq.gaffer.store.StoreTrait;
+import uk.gov.gchq.gaffer.store.operation.DeleteAllData;
 import uk.gov.gchq.gaffer.store.operation.GetTraits;
 import uk.gov.gchq.gaffer.store.operation.handler.GetTraitsHandler;
 import uk.gov.gchq.gaffer.store.operation.handler.OperationHandler;
@@ -148,6 +149,11 @@ protected OperationHandler<? extends DeleteElements> getDeleteElementsHandler()
             return null;
         }
 
+        @Override
+        protected OperationHandler<DeleteAllData> getDeleteAllDataHandler() {
+            return null;
+        }
+
         @Override
         protected OutputOperationHandler<GetTraits, Set<StoreTrait>> getGetTraitsHandler() {
             return new GetTraitsHandler(traits);
diff --git a/core/store/src/test/java/uk/gov/gchq/gaffer/store/operation/handler/GetGraphCreatedTimeHandlerTest.java b/core/store/src/test/java/uk/gov/gchq/gaffer/store/operation/handler/GetGraphCreatedTimeHandlerTest.java
new file mode 100644
index 00000000000..edd264026ec
--- /dev/null
+++ b/core/store/src/test/java/uk/gov/gchq/gaffer/store/operation/handler/GetGraphCreatedTimeHandlerTest.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.store.operation.handler;
+
+import org.junit.jupiter.api.Test;
+import static org.mockito.Mockito.mock;
+
+import uk.gov.gchq.gaffer.operation.OperationException;
+import uk.gov.gchq.gaffer.operation.impl.get.GetGraphCreatedTime;
+import uk.gov.gchq.gaffer.store.Context;
+import uk.gov.gchq.gaffer.store.Store;
+import uk.gov.gchq.gaffer.user.User;
+
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class GetGraphCreatedTimeHandlerTest {
+    private final Store store = mock(Store.class);
+    private final Context context = new Context(new User());
+    private final GetGraphCreatedTimeHandler handler = new GetGraphCreatedTimeHandler();
+
+    @Test
+    void shouldReturnGraphCreatedTimeMap() throws OperationException {
+        // Given
+        GetGraphCreatedTime op = new GetGraphCreatedTime();
+
+        // When
+        Map<String, String> result = handler.doOperation(op, context, store);
+
+        // Then
+        assertThat(result).isInstanceOf(Map.class);
+    }
+}
diff --git a/core/store/src/test/java/uk/gov/gchq/gaffer/store/operation/handler/TestAddToGraphLibraryImpl.java b/core/store/src/test/java/uk/gov/gchq/gaffer/store/operation/handler/TestAddToGraphLibraryImpl.java
index 19e17193dd9..1ce44a44781 100644
--- a/core/store/src/test/java/uk/gov/gchq/gaffer/store/operation/handler/TestAddToGraphLibraryImpl.java
+++ b/core/store/src/test/java/uk/gov/gchq/gaffer/store/operation/handler/TestAddToGraphLibraryImpl.java
@@ -27,6 +27,7 @@
 import uk.gov.gchq.gaffer.serialisation.ToBytesSerialiser;
 import uk.gov.gchq.gaffer.store.Store;
 import uk.gov.gchq.gaffer.store.StoreTrait;
+import uk.gov.gchq.gaffer.store.operation.DeleteAllData;
 import uk.gov.gchq.gaffer.store.operation.GetTraits;
 
 import java.util.HashSet;
@@ -57,6 +58,11 @@ protected OperationHandler<? extends AddElements> getAddElementsHandler() {
         return null;
     }
 
+    @Override
+    protected OperationHandler<DeleteAllData> getDeleteAllDataHandler() {
+        return null;
+    }
+
     @Override
     protected OutputOperationHandler<GetTraits, Set<StoreTrait>> getGetTraitsHandler() {
         return new GetTraitsHandler(new HashSet<>(0));
diff --git a/example/federated-demo/README.md b/example/federated-demo/README.md
index 7b8f461a526..9157f56a30f 100644
--- a/example/federated-demo/README.md
+++ b/example/federated-demo/README.md
@@ -71,8 +71,7 @@ To add a Map graph, execute this operation (or run addMapEdgesGraph.sh):
            ]
          }
        }
-     }
-    },
+     },
     "isPublic": true
 }
 ```
diff --git a/library/tinkerpop/pom.xml b/library/tinkerpop/pom.xml
index 645ec6d4963..1536f173bc5 100644
--- a/library/tinkerpop/pom.xml
+++ b/library/tinkerpop/pom.xml
@@ -111,6 +111,12 @@
             <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>uk.gov.gchq.gaffer</groupId>
+            <artifactId>simple-federated-store</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>test</scope>
+        </dependency>
         <!-- For standard gremlin test suites -->
         <dependency>
             <groupId>org.apache.tinkerpop</groupId>
diff --git a/library/tinkerpop/src/main/java/uk/gov/gchq/gaffer/tinkerpop/GafferPopGraph.java b/library/tinkerpop/src/main/java/uk/gov/gchq/gaffer/tinkerpop/GafferPopGraph.java
index 89d4af3397d..e416951b825 100755
--- a/library/tinkerpop/src/main/java/uk/gov/gchq/gaffer/tinkerpop/GafferPopGraph.java
+++ b/library/tinkerpop/src/main/java/uk/gov/gchq/gaffer/tinkerpop/GafferPopGraph.java
@@ -35,6 +35,7 @@
 import org.slf4j.LoggerFactory;
 
 import uk.gov.gchq.gaffer.data.element.Element;
+import uk.gov.gchq.gaffer.data.element.id.EntityId;
 import uk.gov.gchq.gaffer.data.elementdefinition.view.View;
 import uk.gov.gchq.gaffer.graph.Graph;
 import uk.gov.gchq.gaffer.graph.GraphConfig;
@@ -51,13 +52,16 @@
 import uk.gov.gchq.gaffer.operation.impl.get.GetAllElements;
 import uk.gov.gchq.gaffer.operation.impl.get.GetElements;
 import uk.gov.gchq.gaffer.operation.io.Input;
+import uk.gov.gchq.gaffer.store.operation.GetSchema;
 import uk.gov.gchq.gaffer.store.schema.Schema;
 import uk.gov.gchq.gaffer.tinkerpop.generator.GafferEdgeGenerator;
 import uk.gov.gchq.gaffer.tinkerpop.generator.GafferEntityGenerator;
 import uk.gov.gchq.gaffer.tinkerpop.generator.GafferPopElementGenerator;
 import uk.gov.gchq.gaffer.tinkerpop.process.traversal.strategy.optimisation.GafferPopGraphStepStrategy;
 import uk.gov.gchq.gaffer.tinkerpop.process.traversal.strategy.optimisation.GafferPopHasStepStrategy;
+import uk.gov.gchq.gaffer.tinkerpop.process.traversal.strategy.optimisation.GafferPopVertexStepStrategy;
 import uk.gov.gchq.gaffer.tinkerpop.process.traversal.util.GafferCustomTypeFactory;
+import uk.gov.gchq.gaffer.tinkerpop.process.traversal.util.GafferVertexUtils;
 import uk.gov.gchq.gaffer.tinkerpop.service.GafferPopNamedOperationServiceFactory;
 import uk.gov.gchq.gaffer.user.User;
 import uk.gov.gchq.koryphe.iterable.MappedIterable;
@@ -78,6 +82,7 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
@@ -178,14 +183,14 @@ public class GafferPopGraph implements org.apache.tinkerpop.gremlin.structure.Gr
     public static final String OP_OPTIONS = "gaffer.operation.options";
 
     /**
-     * Configuration key for the max number of elements returned by getAllElements
+     * Configuration key for the max number of elements returned by a getElements
      */
-    public static final String GET_ALL_ELEMENTS_LIMIT = "gaffer.elements.getalllimit";
+    public static final String GET_ELEMENTS_LIMIT = "gaffer.elements.getlimit";
 
     /**
-     * Default value for the max number of elements returned by getAllElements
+     * Default value for the max number of elements returned by getElements
      */
-    public static final int DEFAULT_GET_ALL_ELEMENTS_LIMIT = 5000;
+    public static final int DEFAULT_GET_ELEMENTS_LIMIT = 5000;
 
     /**
      * Configuration key for when to apply HasStep filtering
@@ -254,7 +259,7 @@ public enum DefaultIdManager {
     private final ServiceRegistry serviceRegistry;
 
     private static final Logger LOGGER = LoggerFactory.getLogger(GafferPopGraph.class);
-    private static final String GET_ALL_DEBUG_MSG = "Requested a GetAllElements, results will be truncated to: {}.";
+    private static final String GET_DEBUG_MSG = "Requested a GetElements, results will be truncated to: {}.";
     private static final Pattern EDGE_ID_REGEX = Pattern.compile("^\\s*\\[\\s*(?<src>[a-zA-Z0-9|-]*)\\s*(,\\s*(?<label>[a-zA-Z0-9|-]*))?\\s*,\\s*(?<dest>[a-zA-Z0-9|-]*)\\s*\\]\\s*$");
 
     public GafferPopGraph(final Configuration configuration) {
@@ -288,7 +293,8 @@ public GafferPopGraph(final Configuration configuration, final Graph graph) {
         // Add and register custom traversals
         TraversalStrategies traversalStrategies = GlobalCache.getStrategies(this.getClass()).addStrategies(
                 GafferPopGraphStepStrategy.instance(),
-                GafferPopHasStepStrategy.instance());
+                GafferPopHasStepStrategy.instance(),
+                GafferPopVertexStepStrategy.instance());
         GlobalCache.registerStrategies(this.getClass(), traversalStrategies);
     }
 
@@ -394,7 +400,7 @@ public void addEdge(final GafferPopEdge edge) {
     /**
      * This performs a GetElements operation on Gaffer.
      * If no vertex ids are provided, it performs a GetAllElements operation instead.
-     * The results of GetAllElements will be truncated to a configured max size.
+     * The results of GetElements will be truncated to a configured max size.
      *
      * @param vertexIds vertex ids to query for.
      * Supports input as a {@link Vertex}, {@link Edge}, List of Edge IDs or individual Vertex IDs.
@@ -406,21 +412,22 @@ public void addEdge(final GafferPopEdge edge) {
     public Iterator<Vertex> vertices(final Object... vertexIds) {
         final boolean getAll = null == vertexIds || 0 == vertexIds.length;
         final OperationChain<Iterable<? extends Element>> getOperation;
+        final Iterable<Vertex> orphanVertices;
 
+        LOGGER.debug(GET_DEBUG_MSG, variables.getElementsLimit());
         if (getAll) {
-            LOGGER.debug(GET_ALL_DEBUG_MSG, variables.getAllElementsLimit());
             getOperation = new Builder()
                     .first(new GetAllElements.Builder()
                             .view(createAllEntitiesView())
                             .build())
-                    .then(new Limit<Element>(variables.getAllElementsLimit(), true))
+                    .then(new Limit<Element>(variables.getElementsLimit(), true))
                     .build();
         } else {
             getOperation = new Builder()
                 .first(new GetElements.Builder()
                     .input(getElementSeeds(Arrays.asList(vertexIds)))
-                    .view(createAllEntitiesView())
                     .build())
+                .then(new Limit<Element>(variables.getElementsLimit(), true))
                 .build();
         }
         // Run requested chain on the graph
@@ -432,14 +439,20 @@ public Iterator<Vertex> vertices(final Object... vertexIds) {
                 .map(generator::_apply)
                 .filter(Vertex.class::isInstance)
                 .map(e -> (Vertex) e)
+                .limit(variables.getElementsLimit())
                 .iterator();
 
-        if (getAll && IterableUtils.size(translatedResults) == variables.getAllElementsLimit()) {
+        if (IterableUtils.size(translatedResults) >= variables.getElementsLimit()) {
             LOGGER.warn(
-                "Result size is equal to configured limit ({}). Results may have been truncated",
-                variables.getAllElementsLimit());
+                "Result size is greater than or equal to configured limit ({}). Results may have been truncated",
+                variables.getElementsLimit());
         }
-        return translatedResults.iterator();
+
+        // Check for seeds that are not entities but are vertices on an edge (orphan vertices)
+        orphanVertices = GafferVertexUtils.getOrphanVertices(result, this, vertexIds);
+        Iterable<Vertex> chainedIterable = IterableUtils.chainedIterable(translatedResults, orphanVertices);
+
+        return chainedIterable.iterator();
     }
 
     /**
@@ -530,7 +543,6 @@ public Iterator<Vertex> adjVerticesWithView(final Object vertexId, final Directi
      * Given an iterable of vertex ids, adjacent vertices will be returned.
      * If you provide any optional labels then you must provide edge labels and the vertex
      * labels - any missing labels will cause the elements to be filtered out.
-     * This method will not return 'id' vertices, only vertices that exist as entities in Gaffer.
      *
      * @param vertexIds the iterable of vertex ids to start at.
      * @param direction the direction along edges to travel
@@ -556,13 +568,13 @@ public Iterator<Edge> edges(final Object... elementIds) {
         final boolean getAll = null == elementIds || 0 == elementIds.length;
         final OperationChain<Iterable<? extends Element>> getOperation;
 
+        LOGGER.debug(GET_DEBUG_MSG, variables.getElementsLimit());
         if (getAll) {
-            LOGGER.debug(GET_ALL_DEBUG_MSG, variables.getAllElementsLimit());
             getOperation = new Builder()
                 .first(new GetAllElements.Builder()
                         .view(createAllEdgesView())
                         .build())
-                .then(new Limit<>(variables.getAllElementsLimit(), true))
+                .then(new Limit<>(variables.getElementsLimit(), true))
                 .build();
         } else {
 
@@ -581,6 +593,7 @@ public Iterator<Edge> edges(final Object... elementIds) {
                     .input(getElementSeeds(Arrays.asList(elementIds)))
                     .view(builder.build())
                     .build())
+                .then(new Limit<>(variables.getElementsLimit(), true))
                 .build();
         }
 
@@ -593,12 +606,13 @@ public Iterator<Edge> edges(final Object... elementIds) {
                 .map(generator::_apply)
                 .filter(Edge.class::isInstance)
                 .map(e -> (Edge) e)
+                .limit(variables.getElementsLimit())
                 .iterator();
 
-        if (getAll && IterableUtils.size(translatedResults) == variables.getAllElementsLimit()) {
+        if (IterableUtils.size(translatedResults) >= variables.getElementsLimit()) {
             LOGGER.warn(
-                "Result size is equal to configured limit ({}). Results may have been truncated",
-                variables.getAllElementsLimit());
+                "Result size is greater than or equal to configured limit ({}). Results may have been truncated",
+                variables.getElementsLimit());
         }
         return translatedResults.iterator();
     }
@@ -700,6 +714,8 @@ public Features features() {
     }
 
     public <T> T execute(final OperationChain<T> opChain) {
+        // Set options at opChain level
+        opChain.setOptions(variables.getOperationOptions());
         for (final Operation operation : opChain.getOperations()) {
             // Set options on operations
             operation.setOptions(variables.getOperationOptions());
@@ -738,8 +754,8 @@ public void setDefaultVariables(final GafferPopGraphVariables variables) {
         LOGGER.debug("Resetting graph variables to defaults");
         variables.set(GafferPopGraphVariables.OP_OPTIONS, Collections.unmodifiableMap(opOptions));
         variables.set(GafferPopGraphVariables.USER, defaultUser);
-        variables.set(GafferPopGraphVariables.GET_ALL_ELEMENTS_LIMIT,
-                configuration().getInteger(GET_ALL_ELEMENTS_LIMIT, DEFAULT_GET_ALL_ELEMENTS_LIMIT));
+        variables.set(GafferPopGraphVariables.GET_ELEMENTS_LIMIT,
+                configuration().getInteger(GET_ELEMENTS_LIMIT, DEFAULT_GET_ELEMENTS_LIMIT));
         variables.set(GafferPopGraphVariables.HAS_STEP_FILTER_STAGE,
                 configuration().getString(HAS_STEP_FILTER_STAGE, DEFAULT_HAS_STEP_FILTER_STAGE.toString()));
         variables.set(GafferPopGraphVariables.LAST_OPERATION_CHAIN, new OperationChain<Object>());
@@ -769,13 +785,13 @@ private Iterator<GafferPopVertex> verticesWithSeedsAndView(final List<ElementSee
         }
 
         final OperationChain<Iterable<? extends Element>> getOperation;
+        LOGGER.debug(GET_DEBUG_MSG, variables.getElementsLimit());
         if (getAll) {
-            LOGGER.debug(GET_ALL_DEBUG_MSG, variables.getAllElementsLimit());
             getOperation = new Builder()
                     .first(new GetAllElements.Builder()
                             .view(entitiesView)
                             .build())
-                    .then(new Limit<>(variables.getAllElementsLimit(), true))
+                    .then(new Limit<>(variables.getElementsLimit(), true))
                     .build();
         } else {
             getOperation = new Builder()
@@ -783,6 +799,7 @@ private Iterator<GafferPopVertex> verticesWithSeedsAndView(final List<ElementSee
                             .input(seeds)
                             .view(entitiesView)
                             .build())
+                    .then(new Limit<>(variables.getElementsLimit(), true))
                     .build();
 
             if (null == entitiesView || entitiesView.getEntityGroups().contains(ID_LABEL)) {
@@ -803,6 +820,7 @@ private Iterator<GafferPopVertex> verticesWithSeedsAndView(final List<ElementSee
                 .map(generator::_apply)
                 .filter(GafferPopVertex.class::isInstance)
                 .map(e -> (GafferPopVertex) e)
+                .limit(variables.getElementsLimit())
                 .iterator();
 
         return translatedResults.iterator();
@@ -814,16 +832,21 @@ private Iterator<Vertex> adjVerticesWithSeedsAndView(final List<ElementSeed> see
             throw new UnsupportedOperationException("There could be a lot of vertices, so please add some seeds");
         }
 
-        final Iterable<? extends Element> result = execute(new OperationChain.Builder()
+        final Iterable<? extends EntityId> getAdjEntitySeeds = execute(new OperationChain.Builder()
                 .first(new GetAdjacentIds.Builder()
-                        .input(seeds)
-                        .view(view)
-                        .inOutType(getInOutType(direction))
-                        .build())
-                // GetAdjacentIds provides list of entity seeds so run a GetElements to get the actual Entities
-                .then(new GetElements.Builder()
-                        .view(createAllEntitiesView())
-                        .build())
+                    .input(seeds)
+                    .view(view)
+                    .inOutType(getInOutType(direction))
+                    .build())
+                .build());
+
+        List<EntityId> seedList = StreamSupport.stream(getAdjEntitySeeds.spliterator(), false).collect(Collectors.toList());
+
+        // GetAdjacentIds provides list of entity seeds so run a GetElements to get the actual Entities
+        final Iterable<? extends Element> result = execute(new OperationChain.Builder()
+                .first(new GetElements.Builder()
+                    .input(seedList)
+                    .build())
                 .build());
 
         // Translate results to Gafferpop elements
@@ -834,7 +857,13 @@ private Iterator<Vertex> adjVerticesWithSeedsAndView(final List<ElementSeed> see
                 .map(e -> (Vertex) e)
                 .iterator();
 
-        return translatedResults.iterator();
+        // Check for seeds that are not entities but are vertices on an edge (orphan vertices)
+        Iterable<Vertex> chainedIterable = translatedResults;
+        for (final EntityId seed : seedList) {
+            Iterable<Vertex> orphanVertices = GafferVertexUtils.getOrphanVertices(result, this, seed.getVertex());
+            chainedIterable = IterableUtils.chainedIterable(chainedIterable, orphanVertices);
+        }
+        return chainedIterable.iterator();
     }
 
     private Iterator<Edge> edgesWithSeedsAndView(final List<ElementSeed> seeds, final Direction direction, final View view) {
@@ -851,13 +880,13 @@ private Iterator<Edge> edgesWithSeedsAndView(final List<ElementSeed> seeds, fina
         }
 
         final OperationChain<Iterable<? extends Element>> getOperation;
+        LOGGER.debug(GET_DEBUG_MSG, variables.getElementsLimit());
         if (getAll) {
-            LOGGER.debug(GET_ALL_DEBUG_MSG, variables.getAllElementsLimit());
             getOperation = new Builder()
                     .first(new GetAllElements.Builder()
                             .view(edgesView)
                             .build())
-                    .then(new Limit<>(variables.getAllElementsLimit(), true))
+                    .then(new Limit<>(variables.getElementsLimit(), true))
                     .build();
         } else {
             getOperation = new Builder()
@@ -866,6 +895,7 @@ private Iterator<Edge> edgesWithSeedsAndView(final List<ElementSeed> seeds, fina
                             .view(edgesView)
                             .inOutType(getInOutType(direction))
                             .build())
+                    .then(new Limit<>(variables.getElementsLimit(), true))
                     .build();
         }
 
@@ -878,6 +908,7 @@ private Iterator<Edge> edgesWithSeedsAndView(final List<ElementSeed> seeds, fina
                 .map(generator::_apply)
                 .filter(Edge.class::isInstance)
                 .map(e -> (Edge) e)
+                .limit(variables.getElementsLimit())
                 .iterator();
 
         return translatedResults.iterator();
@@ -904,7 +935,12 @@ private View createView(final String... labels) {
         View view = null;
         if (null != labels && 0 < labels.length) {
             final View.Builder viewBuilder = new View.Builder();
-            final Schema schema = graph.getSchema();
+            final Schema schema = execute(new OperationChain.Builder()
+                .first(new GetSchema.Builder()
+                    .compact(true)
+                    .build())
+                .options(opOptions)
+                .build());
             for (final String label : labels) {
                 if (schema.isEntity(label)) {
                     viewBuilder.entity(label);
@@ -945,10 +981,13 @@ private List<ElementSeed> getElementSeeds(final Iterable<Object> ids) {
             List<Object> edgeIdList = new LinkedList<>();
             // Extract Vertex ID
             if (id instanceof Vertex) {
-                seeds.add(new EntitySeed(((Vertex) id).id()));
+                Object parsedId = GafferCustomTypeFactory.parseAsCustomTypeIfValid(((Vertex) id).id());
+                seeds.add(new EntitySeed(parsedId));
             // Extract Edge ID
             } else if (id instanceof Edge) {
-                seeds.add(new EdgeSeed(((Edge) id).outVertex().id(), ((Edge) id).inVertex().id()));
+                Object src = GafferCustomTypeFactory.parseAsCustomTypeIfValid(((Edge) id).outVertex().id());
+                Object target = GafferCustomTypeFactory.parseAsCustomTypeIfValid(((Edge) id).inVertex().id());
+                seeds.add(new EdgeSeed(src, target));
             // Extract source and destination from ID list
             } else if (id instanceof Iterable) {
                 ((Iterable<?>) id).forEach(edgeIdList::add);
diff --git a/library/tinkerpop/src/main/java/uk/gov/gchq/gaffer/tinkerpop/GafferPopGraphVariables.java b/library/tinkerpop/src/main/java/uk/gov/gchq/gaffer/tinkerpop/GafferPopGraphVariables.java
index 05f2f71307f..01ede3dbec2 100644
--- a/library/tinkerpop/src/main/java/uk/gov/gchq/gaffer/tinkerpop/GafferPopGraphVariables.java
+++ b/library/tinkerpop/src/main/java/uk/gov/gchq/gaffer/tinkerpop/GafferPopGraphVariables.java
@@ -54,9 +54,9 @@ public final class GafferPopGraphVariables implements Graph.Variables {
     public static final String USER = "user";
 
     /**
-     * The max number of elements that can be returned by GetAllElements
+     * The max number of elements that can be returned by GetElements
      */
-    public static final String GET_ALL_ELEMENTS_LIMIT = "getAllElementsLimit";
+    public static final String GET_ELEMENTS_LIMIT = "getElementsLimit";
 
     /**
      * When to apply HasStep filtering
@@ -157,8 +157,8 @@ public User getUser() {
         return (User) variables.get(USER);
     }
 
-    public Integer getAllElementsLimit() {
-        return (Integer) variables.get(GET_ALL_ELEMENTS_LIMIT);
+    public Integer getElementsLimit() {
+        return (Integer) variables.get(GET_ELEMENTS_LIMIT);
     }
 
     public String getHasStepFilterStage() {
diff --git a/library/tinkerpop/src/main/java/uk/gov/gchq/gaffer/tinkerpop/process/traversal/step/GafferPopVertexStep.java b/library/tinkerpop/src/main/java/uk/gov/gchq/gaffer/tinkerpop/process/traversal/step/GafferPopVertexStep.java
new file mode 100644
index 00000000000..0d4a06341f2
--- /dev/null
+++ b/library/tinkerpop/src/main/java/uk/gov/gchq/gaffer/tinkerpop/process/traversal/step/GafferPopVertexStep.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.tinkerpop.process.traversal.step;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.Configuring;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.FlatMapStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.VertexStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.Parameters;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Element;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import uk.gov.gchq.gaffer.data.elementdefinition.view.View;
+import uk.gov.gchq.gaffer.tinkerpop.GafferPopGraph;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * Custom GafferPop VertexStep.
+ * <p>
+ * Takes an Iterable of Vertices as input rather than a single Vertex.
+ * This is so we can perform a single Gaffer query for multiple vertices rather
+ * than one each.
+ * <p>
+ * There are some consequences to this optimisation, for queries where there are
+ * multiple of the same input seed.
+ * In Gremlin, you would expect to get multiple of the same result.
+ * However, in Gaffer, if you supply multiple of the same seed only one result
+ * is returned.
+ * <p>
+ * e.g. for the Tinkerpop Modern Graph:
+ *
+ * <pre>
+ * (Gremlin)   g.V().out() = [v2, v3, v3, v3, v4, v5]
+ * (GafferPop) g.V().out() = [v2, v3, v4, v5]
+ * </pre>
+ */
+public class GafferPopVertexStep<E extends Element> extends FlatMapStep<Iterable<Vertex>, E>
+        implements AutoCloseable, Configuring {
+    private static final Logger LOGGER = LoggerFactory.getLogger(GafferPopVertexStep.class);
+
+    protected Parameters parameters = new Parameters();
+    private final String[] edgeLabels;
+    private Direction direction;
+    private final Class<E> returnClass;
+
+    public GafferPopVertexStep(final VertexStep<E> originalVertexStep) {
+        super(originalVertexStep.getTraversal());
+        this.direction = originalVertexStep.getDirection();
+        this.edgeLabels = originalVertexStep.getEdgeLabels();
+        this.returnClass = originalVertexStep.getReturnClass();
+        this.traversal = originalVertexStep.getTraversal();
+    }
+
+    @Override
+    public Parameters getParameters() {
+        return this.parameters;
+    }
+
+    @Override
+    public void configure(final Object... keyValues) {
+        this.parameters.set(null, keyValues);
+    }
+
+    @Override
+    protected Iterator<E> flatMap(final Traverser.Admin<Iterable<Vertex>> traverser) {
+        return Vertex.class.isAssignableFrom(returnClass) ?
+            (Iterator<E>) this.vertices(traverser.get()) :
+            (Iterator<E>) this.edges(traverser.get());
+    }
+
+    public Direction getDirection() {
+        return this.direction;
+    }
+
+    public String[] getEdgeLabels() {
+        return this.edgeLabels;
+    }
+
+    public Class<E> getReturnClass() {
+        return this.returnClass;
+    }
+
+    public void reverseDirection() {
+        this.direction = this.direction.opposite();
+    }
+
+    public boolean returnsVertex() {
+        return this.returnClass.equals(Vertex.class);
+    }
+
+    public boolean returnsEdge() {
+        return this.returnClass.equals(Edge.class);
+    }
+
+    @Override
+    public String toString() {
+        return StringFactory.stepString(this, this.direction, Arrays.asList(this.edgeLabels),
+                this.returnClass.getSimpleName().toLowerCase());
+    }
+
+    @Override
+    public int hashCode() {
+        int result = Objects.hash(super.hashCode(), direction, returnClass);
+        // edgeLabels' order does not matter because in("x", "y") and in("y", "x") must
+        // be considered equal.
+        if (edgeLabels != null && edgeLabels.length > 0) {
+            final List<String> sortedEdgeLabels = Arrays.stream(edgeLabels)
+                    .sorted(Comparator.nullsLast(Comparator.naturalOrder())).collect(Collectors.toList());
+            for (final String edgeLabel : sortedEdgeLabels) {
+                result = 31 * result + Objects.hashCode(edgeLabel);
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public boolean equals(final Object other) {
+        return other != null
+            && other.getClass().equals(this.getClass())
+            && this.hashCode() == other.hashCode();
+    }
+
+    @Override
+    public void close() throws Exception {
+        closeIterator();
+    }
+
+    @Override
+    public Set<TraverserRequirement> getRequirements() {
+        return Collections.singleton(TraverserRequirement.OBJECT);
+    }
+
+    private Iterator<Vertex> vertices(final Iterable<Vertex> vertices) {
+        GafferPopGraph graph = (GafferPopGraph) getTraversal().getGraph().get();
+
+        if (edgeLabels.length == 0) {
+            LOGGER.debug("Getting {} AdjVertices for vertices", direction);
+            return graph.adjVertices((Iterable) vertices, direction);
+        }
+
+        LOGGER.debug("Getting {} AdjVertices for edges {} for vertices", direction, edgeLabels);
+        View view = new View.Builder().edges(Arrays.asList(edgeLabels)).build();
+        return graph.adjVerticesWithView((Iterable) vertices, direction, view);
+    }
+
+    private Iterator<Edge> edges(final Iterable<Vertex> vertices) {
+        GafferPopGraph graph = (GafferPopGraph) getTraversal().getGraph().get();
+
+        if (edgeLabels.length == 0) {
+            LOGGER.debug("Getting {} edges for vertices", direction);
+            return graph.edges((Iterable) vertices, direction);
+        }
+
+        LOGGER.debug("Getting {} edges with labels {} for vertices", direction, edgeLabels);
+        View view = new View.Builder().edges(Arrays.asList(edgeLabels)).build();
+        return graph.edgesWithView((Iterable) vertices, direction, view);
+    }
+}
diff --git a/library/tinkerpop/src/main/java/uk/gov/gchq/gaffer/tinkerpop/process/traversal/step/LazyFoldStep.java b/library/tinkerpop/src/main/java/uk/gov/gchq/gaffer/tinkerpop/process/traversal/step/LazyFoldStep.java
new file mode 100644
index 00000000000..f08cd3a3ce7
--- /dev/null
+++ b/library/tinkerpop/src/main/java/uk/gov/gchq/gaffer/tinkerpop/process/traversal/step/LazyFoldStep.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.tinkerpop.process.traversal.step;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Step;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser.Admin;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.AbstractStep;
+import org.apache.tinkerpop.gremlin.process.traversal.util.FastNoSuchElementException;
+
+import java.util.Iterator;
+
+/**
+ * A Lazy implementation of the FoldStep
+ * Folds to a lazy iterable
+ */
+public class LazyFoldStep<S> extends AbstractStep<S, Iterable<S>> {
+
+    private boolean done = false;
+
+    public LazyFoldStep(final Traversal.Admin<S, Iterable<S>> traversal) {
+        super(traversal);
+    }
+
+    @Override
+    public Admin<Iterable<S>> processNextStart() {
+        if (done) {
+            throw FastNoSuchElementException.instance();
+        }
+
+        // Do nothing on subsequent calls
+        this.done = true;
+
+        Iterable<S> lazyIterable = () -> new Iterator<S>() {
+            @Override
+            public boolean hasNext() {
+                return LazyFoldStep.this.starts.hasNext();
+            }
+
+            @Override
+            public S next() {
+                if (!hasNext()) {
+                    throw FastNoSuchElementException.instance();
+                }
+
+                return LazyFoldStep.this.starts.next().get();
+            }
+        };
+
+        return this.getTraversal().getTraverserGenerator().generate(lazyIterable, (Step) this, 1L);
+    }
+}
diff --git a/library/tinkerpop/src/main/java/uk/gov/gchq/gaffer/tinkerpop/process/traversal/strategy/optimisation/GafferPopVertexStepStrategy.java b/library/tinkerpop/src/main/java/uk/gov/gchq/gaffer/tinkerpop/process/traversal/strategy/optimisation/GafferPopVertexStepStrategy.java
new file mode 100644
index 00000000000..fb5972ee083
--- /dev/null
+++ b/library/tinkerpop/src/main/java/uk/gov/gchq/gaffer/tinkerpop/process/traversal/strategy/optimisation/GafferPopVertexStepStrategy.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.tinkerpop.process.traversal.strategy.optimisation;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal.Admin;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.VertexStep;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
+import org.apache.tinkerpop.gremlin.structure.Element;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import uk.gov.gchq.gaffer.tinkerpop.process.traversal.step.GafferPopVertexStep;
+import uk.gov.gchq.gaffer.tinkerpop.process.traversal.step.LazyFoldStep;
+
+/**
+ * Optimisation strategy to reduce the number of Gaffer operations performed.
+ * Replaces the VertexStep so they operate on multiple vertices at once.
+ */
+public final class GafferPopVertexStepStrategy
+        extends AbstractTraversalStrategy<TraversalStrategy.ProviderOptimizationStrategy>
+        implements TraversalStrategy.ProviderOptimizationStrategy {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(GafferPopVertexStepStrategy.class);
+    private static final GafferPopVertexStepStrategy INSTANCE = new GafferPopVertexStepStrategy();
+
+    private GafferPopVertexStepStrategy() {
+    }
+
+    @Override
+    public void apply(final Admin<?, ?> traversal) {
+        TraversalHelper.getStepsOfClass(VertexStep.class, traversal).forEach(originalVertexStep -> {
+            LOGGER.debug("Inserting FoldStep and replacing VertexStep");
+
+            // Replace vertex step
+            final GafferPopVertexStep<? extends Element> listVertexStep = new GafferPopVertexStep<>(
+                    originalVertexStep);
+            TraversalHelper.replaceStep(originalVertexStep, listVertexStep, traversal);
+
+            // Add in a fold step before the new VertexStep so that the input is the list of
+            // all vertices
+            LazyFoldStep<Vertex> lazyFoldStep = new LazyFoldStep<>(originalVertexStep.getTraversal());
+            TraversalHelper.insertBeforeStep(lazyFoldStep, listVertexStep, traversal);
+        });
+    }
+
+    public static GafferPopVertexStepStrategy instance() {
+        return INSTANCE;
+    }
+
+}
diff --git a/library/tinkerpop/src/main/java/uk/gov/gchq/gaffer/tinkerpop/process/traversal/util/GafferVertexUtils.java b/library/tinkerpop/src/main/java/uk/gov/gchq/gaffer/tinkerpop/process/traversal/util/GafferVertexUtils.java
new file mode 100644
index 00000000000..be409317801
--- /dev/null
+++ b/library/tinkerpop/src/main/java/uk/gov/gchq/gaffer/tinkerpop/process/traversal/util/GafferVertexUtils.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.tinkerpop.process.traversal.util;
+
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import uk.gov.gchq.gaffer.data.element.Edge;
+import uk.gov.gchq.gaffer.data.element.Element;
+import uk.gov.gchq.gaffer.data.element.Entity;
+import uk.gov.gchq.gaffer.tinkerpop.GafferPopGraph;
+import uk.gov.gchq.gaffer.tinkerpop.GafferPopVertex;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+
+public final class GafferVertexUtils {
+    private static final Logger LOGGER = LoggerFactory.getLogger(GafferVertexUtils.class);
+
+    private GafferVertexUtils() {
+        // Utility class
+    }
+
+    /**
+     * Util method to extract vertices that are vertices on an edge but do not have an
+     * associated {@link Vertex} or {@link Entity} the current graph.
+     * These vertices exist only on an edge.
+     *
+     *
+     * @param result The results from a Gaffer query
+     * @param graph The GafferPop graph being queried
+     * @param vertexIds The vertexIds that have been used as seeds in the query
+     * @return Iterable of 'orphan' {@link Vertex}'s
+     */
+
+    public static Iterable<Vertex> getOrphanVertices(final Iterable<? extends Element> result, final GafferPopGraph graph, final Object... vertexIds) {
+        // Check for any vertex ID seeds that are not returned as Entities
+        List<Object> orphanVertexIds = Arrays.stream(vertexIds)
+            .filter(id -> StreamSupport.stream(result.spliterator(), false)
+                .filter(Entity.class::isInstance)
+                .map(e -> ((Entity) e).getVertex())
+                .noneMatch(e -> e.equals(id)))
+            .collect(Collectors.toList());
+
+        orphanVertexIds.forEach(id -> LOGGER.debug("Getting orphan vertices for vertex {}", id));
+        return (orphanVertexIds.isEmpty()) ? Collections.emptyList() : extractOrphanVerticesFromEdges(result, graph, orphanVertexIds);
+    }
+
+    /**
+     * Extracts vertices from {@link Edge}'s which have not been stored as
+     * an {@link Entity} in Gaffer. These will be returned as a 'dummy' {@link Vertex}.
+     *
+     * @param result The results of a Gaffer query
+     * @param graph The GafferPop graph being queried
+     * @param orphanVertexIds Any seeds that were not found to have an entity
+     * @return Iterable of 'orphan' {@link Vertex}'s
+     */
+    private static Iterable<Vertex> extractOrphanVerticesFromEdges(final Iterable<? extends Element> result, final GafferPopGraph graph, final List<Object> orphanVertexIds) {
+        List<Vertex> orphanVertices = new ArrayList<>();
+        StreamSupport.stream(result.spliterator(), false)
+            .filter(Edge.class::isInstance)
+            .map(e -> (Edge) e)
+            .forEach(e -> {
+                if (orphanVertexIds.contains(e.getSource()) || orphanVertexIds.equals(e.getSource())) {
+                    orphanVertices.add(new GafferPopVertex(GafferPopGraph.ID_LABEL, GafferCustomTypeFactory.parseForGraphSONv3(e.getSource()), graph));
+                }
+                if (orphanVertexIds.contains(e.getDestination()) || orphanVertexIds.equals(e.getDestination())) {
+                    orphanVertices.add(new GafferPopVertex(GafferPopGraph.ID_LABEL, GafferCustomTypeFactory.parseForGraphSONv3(e.getDestination()), graph));
+                }
+            });
+        return orphanVertices;
+    }
+}
diff --git a/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/GafferPopFederatedIT.java b/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/GafferPopFederatedIT.java
index 3242c4e2660..2e7d6c5d9a8 100644
--- a/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/GafferPopFederatedIT.java
+++ b/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/GafferPopFederatedIT.java
@@ -16,138 +16,17 @@
 
 package uk.gov.gchq.gaffer.tinkerpop;
 
-import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.T;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-
+import uk.gov.gchq.gaffer.operation.OperationException;
 import uk.gov.gchq.gaffer.tinkerpop.util.GafferPopTestUtil.StoreType;
 import uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernFederatedTestUtils;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernFederatedTestUtils.CREATED_GRAPH_ID;
-import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernFederatedTestUtils.KNOWS_GRAPH_ID;
-import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.JOSH;
-import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.LOP;
-import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.MARKO;
-import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.PERSON;
-import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.RIPPLE;
-import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.SOFTWARE;
-import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.VADAS;
-import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.WEIGHT;
-
 /**
  * Test specific Federated features with Gremlin
- * General tests run against a federated graph should go in GafferPopGraphIT
  */
-class GafferPopFederatedIT {
-    private static GafferPopGraph gafferPopGraph;
-    private final String graphIdOption = "gaffer.federatedstore.operation.graphIds:";
-    private final List<String> knowsGraphOptions = Arrays.asList(graphIdOption + KNOWS_GRAPH_ID);
-    private final List<String> createdGraphOptions = Arrays.asList(graphIdOption + CREATED_GRAPH_ID);
-
-
-    @BeforeAll
-    public static void setUp() throws Exception {
-        gafferPopGraph = GafferPopModernFederatedTestUtils.createModernGraph(GafferPopFederatedIT.class, StoreType.MAP);
-    }
-
-    @Test
-    void shouldReturnVerticesByLabelFromSpecificGraph() {
-        // Given
-        GraphTraversalSource g = gafferPopGraph.traversal();
-
-        // When
-        List<Map<Object, Object>> result = g.with(GafferPopGraphVariables.OP_OPTIONS, knowsGraphOptions)
-                .V().hasLabel(PERSON).elementMap().toList();
-
-        // Then
-        assertThat(result)
-                .containsExactlyInAnyOrder(
-                        MARKO.getPropertyMap(),
-                        JOSH.getPropertyMap(),
-                        VADAS.getPropertyMap()
-                );
-    }
-
-    @Test
-    void shouldReturnFilteredVerticesFromSpecificGraph() {
-        // Given
-        GraphTraversalSource g = gafferPopGraph.traversal();
-
-        // When
-        List<Object> result = g.with(GafferPopGraphVariables.OP_OPTIONS, createdGraphOptions)
-                .V()
-                .outE()
-                .has(WEIGHT, P.gt(0.2))
-                .values(WEIGHT)
-                .toList();
-
-        // Then
-        assertThat(result)
-                .containsExactly(0.4, 0.4, 1.0);
-    }
-
-    @Test
-    void shouldGroupVerticesByLabelAndProvideCountFromSpecificGraph() {
-        // Given
-        GraphTraversalSource g = gafferPopGraph.traversal();
-
-        // When
-        List<Map<Object, Long>> result = g.with(GafferPopGraphVariables.OP_OPTIONS, createdGraphOptions).V().groupCount()
-                .by(T.label).toList();
-
-        assertThat(result)
-                .first()
-                .hasFieldOrPropertyWithValue(PERSON, 3L)
-                .hasFieldOrPropertyWithValue(SOFTWARE, 2L);
-    }
-
-    @Test
-    void shouldGetEdgesByIdFromSpecificGraph() {
-        // Given
-        GraphTraversalSource g = gafferPopGraph.traversal();
-
-        // When
-        List<Edge> result = g.with(GafferPopGraphVariables.OP_OPTIONS, createdGraphOptions).E("[4, 3]").toList();
-
-        assertThat(result)
-                .extracting(item -> item.id())
-                .containsExactly(JOSH.created(LOP));
-    }
-
-    @Test
-    void shouldGetOutgoingEdgesFromSpecificGraph() {
-        // Given
-        GraphTraversalSource g = gafferPopGraph.traversal();
-
-        // When
-        List<Edge> result = g.with(GafferPopGraphVariables.OP_OPTIONS, knowsGraphOptions).V(MARKO.getId()).outE().toList();
-
-        // Then
-        assertThat(result)
-                .extracting(item -> item.id())
-                .containsExactlyInAnyOrder(MARKO.knows(VADAS), MARKO.knows(JOSH));
-    }
-
-    @Test
-    void shouldGetIncomingEdgesFromSpecificGraph() {
-        // Given
-        GraphTraversalSource g = gafferPopGraph.traversal();
-
-        // When
-        List<Edge> result = g.with(GafferPopGraphVariables.OP_OPTIONS, createdGraphOptions).V(RIPPLE.getId()).inE()
-                .toList();
+class GafferPopFederatedIT extends GafferPopFederationTests {
 
-        // Then
-        assertThat(result)
-                .extracting(item -> item.id())
-                .containsExactlyInAnyOrder(JOSH.created(RIPPLE));
+    @Override
+    protected GafferPopGraph getGraph() throws OperationException {
+        return GafferPopModernFederatedTestUtils.createModernGraph(GafferPopFederatedIT.class, StoreType.MAP);
     }
 }
diff --git a/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/GafferPopFederationTests.java b/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/GafferPopFederationTests.java
new file mode 100644
index 00000000000..8baed6e705e
--- /dev/null
+++ b/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/GafferPopFederationTests.java
@@ -0,0 +1,411 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.tinkerpop;
+
+import org.apache.tinkerpop.gremlin.process.traversal.P;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.T;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.junit.jupiter.api.Test;
+
+import uk.gov.gchq.gaffer.cache.CacheServiceLoader;
+import uk.gov.gchq.gaffer.operation.OperationException;
+import uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernFederatedTestUtils.CREATED_GRAPH_ID;
+import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernFederatedTestUtils.KNOWS_GRAPH_ID;
+import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.CREATED;
+import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.JOSH;
+import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.KNOWS;
+import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.LOP;
+import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.MARKO;
+import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.NAME;
+import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.PERSON;
+import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.PETER;
+import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.RIPPLE;
+import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.SOFTWARE;
+import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.VADAS;
+import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.WEIGHT;
+
+public abstract class GafferPopFederationTests {
+    private final String graphIdOption = "gaffer.federatedstore.operation.graphIds:";
+    private final List<String> knowsGraphOptions = Arrays.asList(graphIdOption + KNOWS_GRAPH_ID);
+    private final List<String> createdGraphOptions = Arrays.asList(graphIdOption + CREATED_GRAPH_ID);
+
+    protected abstract GafferPopGraph getGraph() throws OperationException;
+
+    @Test
+    void shouldGetAllVertices() throws OperationException {
+        GraphTraversalSource g = getGraph().traversal();
+        final List<Vertex> result = g.V().toList();
+
+        assertThat(result)
+                .extracting(r -> r.id())
+                .containsExactlyInAnyOrder(
+                        MARKO.getId(),
+                        VADAS.getId(),
+                        JOSH.getId(),
+                        PETER.getId(),
+                        LOP.getId(),
+                        RIPPLE.getId());
+    }
+
+    @Test
+    void shouldTruncateGetAllVertices() throws OperationException {
+        GraphTraversalSource g = getGraph().traversal();
+        final List<Vertex> result = g.with("getElementsLimit", 2).V().toList();
+
+        assertThat(result)
+                .hasSize(2)
+                .extracting(r -> r.id())
+                .containsAnyOf(
+                        MARKO.getId(),
+                        VADAS.getId(),
+                        JOSH.getId(),
+                        PETER.getId(),
+                        LOP.getId(),
+                        RIPPLE.getId());
+    }
+
+    @Test
+    void shouldGetVerticesById() throws OperationException {
+        GraphTraversalSource g = getGraph().traversal();
+        final List<Vertex> result = g.V(MARKO.getId(), RIPPLE.getId()).toList();
+
+        assertThat(result)
+                .extracting(r -> r.id())
+                .containsExactlyInAnyOrder(MARKO.getId(), RIPPLE.getId());
+    }
+
+    @Test
+    void shouldGetVertexPropertyValues() throws OperationException {
+        GraphTraversalSource g = getGraph().traversal();
+        final List<Object> result = g.V(MARKO.getId()).values(NAME).toList();
+
+        assertThat(result)
+                .hasSize(1)
+                .first()
+                .isInstanceOf(String.class)
+                .isEqualTo(MARKO.getName());
+    }
+
+    @Test
+    void shouldGetVerticesByLabel() throws OperationException {
+        GraphTraversalSource g = getGraph().traversal();
+        final List<Vertex> result = g.V().hasLabel(PERSON).toList();
+
+        assertThat(result)
+                .extracting(r -> r.id())
+                .containsExactlyInAnyOrder(
+                    MARKO.getId(),
+                    VADAS.getId(),
+                    JOSH.getId(),
+                    PETER.getId()
+                );
+    }
+
+    @Test
+    void shouldGetAllOutgoingEdgesFromVertex() throws OperationException {
+        GraphTraversalSource g = getGraph().traversal();
+        final List<Edge> result = g.V(MARKO.getId()).outE().toList();
+
+        assertThat(result)
+            .extracting(r -> r.id())
+            .containsExactlyInAnyOrder(
+                MARKO.knows(VADAS),
+                MARKO.knows(JOSH),
+                MARKO.created(LOP)
+            );
+    }
+
+    @Test
+    void shouldCountAllOutgoingEdgesFromVertex() throws OperationException {
+        GraphTraversalSource g = getGraph().traversal();
+        final List<Long> result = g.V(MARKO.getId()).outE().count().toList();
+
+        assertThat(result).containsExactlyInAnyOrder(3L);
+    }
+
+    @Test
+    void shouldGetAllIncomingEdgesFromVertex() throws OperationException {
+        GraphTraversalSource g = getGraph().traversal();
+        final List<String> result = g.V(LOP.getId()).inE().label().toList();
+
+        assertThat(result)
+            .containsExactlyInAnyOrder(
+                CREATED,
+                CREATED,
+                CREATED
+            );
+    }
+
+    @Test
+    void shouldGetAdjacentVerticesNameValues() throws OperationException {
+        GraphTraversalSource g = getGraph().traversal();
+        final List<Object> result = g.V(MARKO.getId()).out().values(NAME).toList();
+
+        assertThat(result)
+                .extracting(r -> (String) r)
+                .containsExactlyInAnyOrder(
+                    LOP.getName(),
+                    VADAS.getName(),
+                    JOSH.getName()
+                );
+    }
+
+    @Test
+    void shouldGroupVerticesByLabelAndProvideCount() throws OperationException {
+        GraphTraversalSource g = getGraph().traversal();
+        List<Map<Object, Long>> result = g.V().groupCount().by(T.label).toList();
+
+        assertThat(result)
+                .first()
+                .hasFieldOrPropertyWithValue(PERSON, 4L)
+                .hasFieldOrPropertyWithValue(SOFTWARE, 2L);
+    }
+
+    @Test
+    void shouldGetAllVerticesConnectedToOutGoingEdgeOfGivenVertex() throws OperationException {
+        GraphTraversalSource g = getGraph().traversal();
+        List<Object> result = g.V(MARKO.getId()).outE().inV().values(NAME).toList();
+
+        assertThat(result)
+        .containsExactlyInAnyOrder(
+            JOSH.getName(),
+            LOP.getName(),
+            VADAS.getName()
+        );
+    }
+
+    @Test
+    void shouldGetPropertiesOfIncomingVerticesForSpecificVertex() throws OperationException {
+        GraphTraversalSource g = getGraph().traversal();
+        List<Map<Object, Object>> result = g.V(JOSH.getId()).inE().outV().elementMap().toList();
+
+        assertThat(result).containsExactly(MARKO.getPropertyMap());
+    }
+
+    @Test
+    void shouldGetAllEdges() throws OperationException {
+        GraphTraversalSource g = getGraph().traversal();
+        final List<Edge> result = g.E().toList();
+
+        assertThat(result)
+                .extracting(r -> r.id())
+                .containsExactlyInAnyOrder(
+                        MARKO.knows(JOSH),
+                        MARKO.knows(VADAS),
+                        MARKO.created(LOP),
+                        JOSH.created(LOP),
+                        JOSH.created(RIPPLE),
+                        PETER.created(LOP));
+    }
+
+    @Test
+    void shouldTruncateGetAllEdges() throws OperationException {
+        GraphTraversalSource g = getGraph().traversal();
+        final List<Edge> result = g.with("getElementsLimit", 2).E().toList();
+
+        assertThat(result)
+                .hasSize(2)
+                .extracting(r -> r.id())
+                .containsAnyOf(
+                        MARKO.knows(JOSH),
+                        MARKO.knows(VADAS),
+                        MARKO.created(LOP),
+                        JOSH.created(LOP),
+                        JOSH.created(RIPPLE),
+                        PETER.created(LOP));
+    }
+
+    @Test
+    void shouldGetEdgeById() throws OperationException {
+        GraphTraversalSource g = getGraph().traversal();
+        List<String> edgeIds = Stream.of(
+            "[1,2]",
+            "   [ 1  , 2   ]  ",
+            "[1,knows,2]",
+            "[1, knows, 2]",
+            " [  1   ,knows  ,    2] "
+        ).collect(Collectors.toList());
+
+        edgeIds.forEach(id -> {
+            final List<Edge> result = g.E(id).toList();
+
+            assertThat(result)
+                // .withFailMessage("(%s) Edge ID: %s returned %s", getGraph(), id, result)
+                .extracting(r -> r.id())
+                .containsExactlyInAnyOrder(MARKO.knows(VADAS));
+        });
+    }
+
+    @Test
+    void shouldAddV() throws OperationException {
+        GraphTraversalSource g = getGraph().traversal();
+        g.addV(PERSON).property(NAME, "stephen").property(T.id, "test").iterate();
+
+        final List<Vertex> result = g.V().toList();
+        assertThat(result)
+                .extracting(r -> r.value(NAME))
+                .contains("stephen");
+        reset();
+    }
+
+    @Test
+    void shouldAddE() throws OperationException {
+        GraphTraversalSource g = getGraph().traversal();
+        g.addE(KNOWS).from(__.V(VADAS.getId())).to(__.V(PETER.getId())).iterate();
+
+        final List<Edge> result = g.E().toList();
+        assertThat(result)
+                .extracting(r -> r.id())
+                .contains(VADAS.knows(PETER));
+        reset();
+    }
+
+    @Test
+    void shouldSeedWithVertexOnlyEdge() throws OperationException {
+        GraphTraversalSource g = getGraph().traversal();
+        // Edge has a vertex but not an entity in the graph - Gaffer only feature
+        getGraph().addEdge(new GafferPopEdge("knows", GafferPopModernTestUtils.MARKO.getId(), "7", getGraph()));
+
+        List<Vertex> result = g.V("7").toList();
+        assertThat(result)
+            .extracting(r -> r.id())
+            .contains("7");
+        reset();
+    }
+
+    @Test
+    void shouldTraverseEdgeWithVertexOnlySeed() throws OperationException {
+        GraphTraversalSource g = getGraph().traversal();
+        // Edge has a vertex but not an entity in the graph - Gaffer only feature
+        getGraph().addEdge(new GafferPopEdge("knows", GafferPopModernTestUtils.MARKO.getId(), "7", getGraph()));
+
+        List<Map<Object, Object>> result = g.V("7").inE().outV().elementMap().toList();
+        assertThat(result)
+            .containsExactly(MARKO.getPropertyMap());
+        reset();
+    }
+
+    @Test
+    void shouldReturnVerticesByLabelFromSpecificGraph() throws OperationException {
+        // Given
+        GraphTraversalSource g = getGraph().traversal();
+
+        // When
+        List<Map<Object, Object>> result = g.with(GafferPopGraphVariables.OP_OPTIONS, knowsGraphOptions)
+            .V().hasLabel(PERSON).elementMap().toList();
+
+        // Then
+        assertThat(result)
+                .containsExactlyInAnyOrder(
+                        MARKO.getPropertyMap(),
+                        JOSH.getPropertyMap(),
+                        VADAS.getPropertyMap()
+                );
+    }
+
+    @Test
+    void shouldReturnFilteredVerticesFromSpecificGraph() throws OperationException {
+        // Given
+        GraphTraversalSource g = getGraph().traversal();
+
+        // When
+        List<Object> result = g.with(GafferPopGraphVariables.OP_OPTIONS, createdGraphOptions)
+                .V()
+                .outE()
+                .has(WEIGHT, P.gt(0.2))
+                .values(WEIGHT)
+                .toList();
+
+        // Then
+        assertThat(result)
+                .containsExactlyInAnyOrder(0.4, 0.4, 1.0);
+    }
+
+    @Test
+    void shouldGroupVerticesByLabelAndProvideCountFromSpecificGraph() throws OperationException {
+        // Given
+        GraphTraversalSource g = getGraph().traversal();
+
+        // When
+        List<Map<Object, Long>> result = g.with(GafferPopGraphVariables.OP_OPTIONS, createdGraphOptions).V().groupCount()
+                .by(T.label).toList();
+
+        assertThat(result)
+                .first()
+                .hasFieldOrPropertyWithValue(PERSON, 3L)
+                .hasFieldOrPropertyWithValue(SOFTWARE, 2L);
+    }
+
+    @Test
+    void shouldGetEdgesByIdFromSpecificGraph() throws OperationException {
+        // Given
+        GraphTraversalSource g = getGraph().traversal();
+
+        // When
+        List<Edge> result = g.with(GafferPopGraphVariables.OP_OPTIONS, createdGraphOptions).E("[4, 3]").toList();
+
+        assertThat(result)
+                .extracting(item -> item.id())
+                .containsExactly(JOSH.created(LOP));
+    }
+
+    @Test
+    void shouldGetOutgoingEdgesFromSpecificGraph() throws OperationException {
+        // Given
+        GraphTraversalSource g = getGraph().traversal();
+
+        // When
+        List<Edge> result = g.with(GafferPopGraphVariables.OP_OPTIONS, knowsGraphOptions).V(MARKO.getId()).outE().toList();
+
+        // Then
+        assertThat(result)
+                .extracting(item -> item.id())
+                .containsExactlyInAnyOrder(MARKO.knows(VADAS), MARKO.knows(JOSH));
+    }
+
+    @Test
+    void shouldGetIncomingEdgesFromSpecificGraph() throws OperationException {
+        // Given
+        GraphTraversalSource g = getGraph().traversal();
+
+        // When
+        List<Edge> result = g.with(GafferPopGraphVariables.OP_OPTIONS, createdGraphOptions).V(RIPPLE.getId()).inE()
+                .toList();
+
+        // Then
+        assertThat(result)
+                .extracting(item -> item.id())
+                .containsExactlyInAnyOrder(JOSH.created(RIPPLE));
+    }
+
+    void reset() {
+        // reset cache for federation
+        CacheServiceLoader.shutdown();
+    }
+}
diff --git a/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/GafferPopGraphIT.java b/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/GafferPopGraphIT.java
index 16b264151e2..07701d92a76 100644
--- a/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/GafferPopGraphIT.java
+++ b/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/GafferPopGraphIT.java
@@ -27,9 +27,7 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 import uk.gov.gchq.gaffer.cache.CacheServiceLoader;
-import uk.gov.gchq.gaffer.operation.OperationException;
 import uk.gov.gchq.gaffer.tinkerpop.util.GafferPopTestUtil.StoreType;
-import uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernFederatedTestUtils;
 import uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils;
 
 import java.util.List;
@@ -56,23 +54,20 @@
  */
 class GafferPopGraphIT {
     private static final String TEST_NAME_FORMAT = "({0}) {displayName}";
+    private static final String VERTEX_ONLY_ID_STRING = "7";
     private static GafferPopGraph mapStore;
     private static GafferPopGraph accumuloStore;
-    private static GafferPopGraph federated;
 
     @BeforeAll
-    public static void createGraphs() throws OperationException {
+    public static void createGraphs() {
         mapStore = GafferPopModernTestUtils.createModernGraph(GafferPopGraphIT.class, StoreType.MAP);
         accumuloStore = GafferPopModernTestUtils.createModernGraph(GafferPopGraphIT.class, StoreType.ACCUMULO);
-        // Federated store with subgraphs using a map store
-        federated = GafferPopModernFederatedTestUtils.createModernGraph(GafferPopGraphIT.class, StoreType.MAP);
     }
 
     private static Stream<Arguments> provideTraversals() {
         return Stream.of(
                 Arguments.of("Map Store", mapStore.traversal()),
-                Arguments.of("Accumulo Store", accumuloStore.traversal()),
-                Arguments.of("Federated (Map Store)", federated.traversal())
+                Arguments.of("Accumulo Store", accumuloStore.traversal())
         );
     }
 
@@ -95,7 +90,7 @@ void shouldGetAllVertices(String graph, GraphTraversalSource g) {
     @ParameterizedTest(name = TEST_NAME_FORMAT)
     @MethodSource("provideTraversals")
     void shouldTruncateGetAllVertices(String graph, GraphTraversalSource g) {
-        final List<Vertex> result = g.with("getAllElementsLimit", 2).V().toList();
+        final List<Vertex> result = g.with("getElementsLimit", 2).V().toList();
 
         assertThat(result)
                 .hasSize(2)
@@ -246,7 +241,7 @@ void shouldGetAllEdges(String graph, GraphTraversalSource g) {
     @ParameterizedTest(name = TEST_NAME_FORMAT)
     @MethodSource("provideTraversals")
     void shouldTruncateGetAllEdges(String graph, GraphTraversalSource g) {
-        final List<Edge> result = g.with("getAllElementsLimit", 2).E().toList();
+        final List<Edge> result = g.with("getElementsLimit", 2).E().toList();
 
         assertThat(result)
                 .hasSize(2)
@@ -283,7 +278,7 @@ void shouldGetEdgeById(String graph, GraphTraversalSource g) {
 
     @ParameterizedTest(name = TEST_NAME_FORMAT)
     @MethodSource("provideTraversals")
-    void shouldAddV(String graph, GraphTraversalSource g) throws OperationException {
+    void shouldAddV(String graph, GraphTraversalSource g) {
         g.addV(PERSON).property(NAME, "stephen").property(T.id, "test").iterate();
 
         final List<Vertex> result = g.V().toList();
@@ -295,7 +290,7 @@ void shouldAddV(String graph, GraphTraversalSource g) throws OperationException
 
     @ParameterizedTest(name = TEST_NAME_FORMAT)
     @MethodSource("provideTraversals")
-    void shouldAddE(String graph, GraphTraversalSource g) throws OperationException {
+    void shouldAddE(String graph, GraphTraversalSource g) {
         g.addE(KNOWS).from(__.V(VADAS.getId())).to(__.V(PETER.getId())).iterate();
 
         final List<Edge> result = g.E().toList();
@@ -305,7 +300,53 @@ void shouldAddE(String graph, GraphTraversalSource g) throws OperationException
         reset();
     }
 
-    void reset() throws OperationException  {
+    @ParameterizedTest(name = TEST_NAME_FORMAT)
+    @MethodSource("provideTraversals")
+    void shouldSeedWithVertexOnlyEdge(String graph, GraphTraversalSource g) {
+        // Edge has a vertex but not an entity in the graph - Gaffer only feature
+        // [1 - knows -> 7]
+        mapStore.addEdge(new GafferPopEdge("knows", GafferPopModernTestUtils.MARKO.getId(), VERTEX_ONLY_ID_STRING, mapStore));
+        accumuloStore.addEdge(new GafferPopEdge("knows", GafferPopModernTestUtils.MARKO.getId(), VERTEX_ONLY_ID_STRING, accumuloStore));
+
+        List<Vertex> result = g.V(VERTEX_ONLY_ID_STRING).toList();
+        assertThat(result)
+            .extracting(r -> r.id())
+            .contains(VERTEX_ONLY_ID_STRING);
+        reset();
+    }
+
+    @ParameterizedTest(name = TEST_NAME_FORMAT)
+    @MethodSource("provideTraversals")
+    void shouldTraverseEdgeWithVertexOnlyEdge(String graph, GraphTraversalSource g) {
+        // Edge has a two vertices with no entities in the graph - Gaffer only feature
+        // [8 - knows -> 7]
+        mapStore.addEdge(new GafferPopEdge("knows", "8", VERTEX_ONLY_ID_STRING, mapStore));
+        accumuloStore.addEdge(new GafferPopEdge("knows", "8", VERTEX_ONLY_ID_STRING, accumuloStore));
+
+        List<Vertex> result = g.V(VERTEX_ONLY_ID_STRING).inE().inV().toList();
+        assertThat(result)
+            .extracting(r -> r.id())
+            .contains(VERTEX_ONLY_ID_STRING);
+        List<Vertex> result2 = g.V(VERTEX_ONLY_ID_STRING).inE().outV().toList();
+        assertThat(result2)
+            .extracting(r -> r.id())
+            .contains("8");
+        List<Vertex> result3 = g.V("8").outE().inV().toList();
+        assertThat(result3)
+            .extracting(r -> r.id())
+            .contains(VERTEX_ONLY_ID_STRING);
+        List<Vertex> result4 = g.V("8").outE().outV().toList();
+        assertThat(result4)
+            .extracting(r -> r.id())
+            .contains("8");
+        List<Vertex> resultLabel = g.V("8").out("knows").toList();
+        assertThat(resultLabel)
+            .extracting(r -> r.id())
+            .containsOnly(VERTEX_ONLY_ID_STRING);
+        reset();
+    }
+
+    void reset() {
         // reset cache for federation
         CacheServiceLoader.shutdown();
         // recreate the graphs
diff --git a/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/GafferPopGraphTest.java b/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/GafferPopGraphTest.java
index 29db09fc4b3..468f7285de9 100644
--- a/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/GafferPopGraphTest.java
+++ b/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/GafferPopGraphTest.java
@@ -79,7 +79,7 @@ void shouldConstructGafferPopGraphWithOnlyConfig() {
         assertThat(variables)
             .hasSize(5)
             .containsEntry(GafferPopGraphVariables.USER, expectedUser)
-            .containsEntry(GafferPopGraphVariables.GET_ALL_ELEMENTS_LIMIT, 1)
+            .containsEntry(GafferPopGraphVariables.GET_ELEMENTS_LIMIT, 1)
             .containsEntry(GafferPopGraphVariables.HAS_STEP_FILTER_STAGE, HasStepFilterStage.POST_TRANSFORM.toString())
             .containsKey(GafferPopGraphVariables.OP_OPTIONS);
 
@@ -104,7 +104,7 @@ void shouldConstructGafferPopGraphWithConfigFile() {
         assertThat(variables)
             .hasSize(5)
             .containsEntry(GafferPopGraphVariables.USER, expectedUser)
-            .containsEntry(GafferPopGraphVariables.GET_ALL_ELEMENTS_LIMIT, 2)
+            .containsEntry(GafferPopGraphVariables.GET_ELEMENTS_LIMIT, 2)
             .containsEntry(GafferPopGraphVariables.HAS_STEP_FILTER_STAGE, HasStepFilterStage.POST_AGGREGATION.toString())
             .containsKey(GafferPopGraphVariables.OP_OPTIONS);
 
@@ -128,8 +128,8 @@ void shouldConstructGafferPopGraph() {
         assertThat(variables)
             .hasSize(5)
             .containsEntry(GafferPopGraphVariables.USER, expectedUser)
-            .containsEntry(GafferPopGraphVariables.GET_ALL_ELEMENTS_LIMIT,
-                    GafferPopGraph.DEFAULT_GET_ALL_ELEMENTS_LIMIT)
+            .containsEntry(GafferPopGraphVariables.GET_ELEMENTS_LIMIT,
+                    GafferPopGraph.DEFAULT_GET_ELEMENTS_LIMIT)
             .containsEntry(GafferPopGraphVariables.HAS_STEP_FILTER_STAGE,
                     GafferPopGraph.DEFAULT_HAS_STEP_FILTER_STAGE.toString())
             .containsKey(GafferPopGraphVariables.OP_OPTIONS);
diff --git a/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/GafferPopSimpleFederatedIT.java b/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/GafferPopSimpleFederatedIT.java
new file mode 100644
index 00000000000..2453e13473d
--- /dev/null
+++ b/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/GafferPopSimpleFederatedIT.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.tinkerpop;
+
+import uk.gov.gchq.gaffer.operation.OperationException;
+import uk.gov.gchq.gaffer.tinkerpop.util.GafferPopTestUtil.StoreType;
+import uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernSimpleFederatedTestUtils;
+
+public class GafferPopSimpleFederatedIT extends GafferPopFederationTests  {
+    @Override
+    protected GafferPopGraph getGraph() throws OperationException {
+        return GafferPopModernSimpleFederatedTestUtils.createModernGraph(GafferPopSimpleFederatedIT.class, StoreType.MAP);
+
+    }
+}
diff --git a/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/process/traversal/step/GafferPopHasStepIT.java b/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/process/traversal/step/GafferPopHasStepIT.java
index e817be0f64e..a3c46fc5628 100644
--- a/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/process/traversal/step/GafferPopHasStepIT.java
+++ b/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/process/traversal/step/GafferPopHasStepIT.java
@@ -222,7 +222,7 @@ void shouldFilterVerticesByPropertyNot() {
 
          assertThat(result)
                  .extracting(r -> r.id())
-                 .containsExactlyInAnyOrder(RIPPLE.getId(), LOP.getId(), LOP.getId(), LOP.getId());
+                 .containsExactlyInAnyOrder(RIPPLE.getId(), LOP.getId());
      }
 
     @Test
diff --git a/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/process/traversal/step/GafferPopVertexStepIT.java b/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/process/traversal/step/GafferPopVertexStepIT.java
new file mode 100644
index 00000000000..6767ad449fe
--- /dev/null
+++ b/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/process/traversal/step/GafferPopVertexStepIT.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.tinkerpop.process.traversal.step;
+
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import uk.gov.gchq.gaffer.tinkerpop.GafferPopGraph;
+import uk.gov.gchq.gaffer.tinkerpop.util.GafferPopTestUtil.StoreType;
+import uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.CREATED;
+import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.JOSH;
+import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.KNOWS;
+import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.LOP;
+import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.MARKO;
+import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.PETER;
+import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.RIPPLE;
+import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.VADAS;
+
+class GafferPopVertexStepIT {
+
+    private static GraphTraversalSource g;
+
+    @BeforeAll
+    public static void beforeAll() {
+        GafferPopGraph modern = GafferPopModernTestUtils.createModernGraph(GafferPopVertexStepIT.class,
+                StoreType.ACCUMULO);
+        g = modern.traversal();
+    }
+
+    @Test
+    void shouldGetOutVertices() {
+        final List<Vertex> result = g.V().out().toList();
+
+        assertThat(result)
+                .extracting(r -> r.id())
+                .containsExactlyInAnyOrder(VADAS.getId(), LOP.getId(), JOSH.getId(), RIPPLE.getId());
+    }
+
+    @Test
+    void shouldGetOutKnowsVertices() {
+        final List<Vertex> result = g.V().out(KNOWS).toList();
+
+        assertThat(result)
+                .extracting(r -> r.id())
+                .containsExactlyInAnyOrder(VADAS.getId(), JOSH.getId());
+    }
+
+    @Test
+    void shouldGetInVertices() {
+        final List<Vertex> result = g.V().in().toList();
+
+        assertThat(result)
+                .extracting(r -> r.id())
+                .containsExactlyInAnyOrder(MARKO.getId(), PETER.getId(), JOSH.getId());
+    }
+
+    @Test
+    void shouldGetInCreatedVertices() {
+        final List<Vertex> result = g.V().in(KNOWS).toList();
+
+        assertThat(result)
+                .extracting(r -> r.id())
+                .containsExactlyInAnyOrder(MARKO.getId());
+    }
+
+    @Test
+    void shouldGetOutEdges() {
+        final List<Edge> result = g.V().outE().toList();
+
+        assertThat(result)
+                .extracting(r -> r.id())
+                .containsExactlyInAnyOrder(
+                        MARKO.knows(JOSH),
+                        MARKO.created(LOP),
+                        MARKO.knows(VADAS),
+                        JOSH.created(LOP),
+                        JOSH.created(RIPPLE),
+                        PETER.created(LOP));
+    }
+
+    @Test
+    void shouldGetOutCreatedEdges() {
+        final List<Edge> result = g.V().outE(CREATED).toList();
+
+        assertThat(result)
+                .extracting(r -> r.id())
+                .containsExactlyInAnyOrder(
+                        MARKO.created(LOP),
+                        JOSH.created(LOP),
+                        JOSH.created(RIPPLE),
+                        PETER.created(LOP));
+    }
+
+    @Test
+    void shouldGetInEdges() {
+        final List<Edge> result = g.V().inE().toList();
+
+        assertThat(result)
+                .extracting(r -> r.id())
+                .containsExactlyInAnyOrder(
+                        MARKO.knows(JOSH),
+                        MARKO.created(LOP),
+                        MARKO.knows(VADAS),
+                        JOSH.created(LOP),
+                        JOSH.created(RIPPLE),
+                        PETER.created(LOP));
+    }
+
+    @Test
+    void shouldGetInCreatedEdges() {
+        final List<Edge> result = g.V().inE(CREATED).toList();
+
+        assertThat(result)
+                .extracting(r -> r.id())
+                .containsExactlyInAnyOrder(
+                        MARKO.created(LOP),
+                        JOSH.created(LOP),
+                        JOSH.created(RIPPLE),
+                        PETER.created(LOP));
+    }
+}
diff --git a/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/process/traversal/step/GafferPopVertexStepTest.java b/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/process/traversal/step/GafferPopVertexStepTest.java
new file mode 100644
index 00000000000..249e27cec45
--- /dev/null
+++ b/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/process/traversal/step/GafferPopVertexStepTest.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.tinkerpop.process.traversal.step;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.VertexStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.Parameters;
+import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import uk.gov.gchq.gaffer.tinkerpop.GafferPopGraph;
+import uk.gov.gchq.gaffer.tinkerpop.util.GafferPopTestUtil.StoreType;
+import uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.KNOWS;
+
+class GafferPopVertexStepTest {
+
+    private static Traversal.Admin<Vertex, Vertex> traversal;
+
+    @BeforeAll
+    public static void beforeAll() {
+        GafferPopGraph modern = GafferPopModernTestUtils.createModernGraph(GafferPopVertexStepIT.class,
+                StoreType.MAP);
+        GraphTraversalSource g = modern.traversal();
+        traversal = g.V().asAdmin();
+    }
+
+    @Test
+    void shouldCheckEquality() {
+        VertexStep<Vertex> vertexStep = new VertexStep<>(traversal, Vertex.class, Direction.BOTH, KNOWS);
+        GafferPopVertexStep<Vertex> listStep = new GafferPopVertexStep<>(vertexStep);
+
+        Traversal.Admin<Vertex, Vertex> otherTraversal = traversal.clone();
+        GafferPopVertexStep<Vertex> otherListStep = new GafferPopVertexStep<>(
+                new VertexStep<>(otherTraversal, Vertex.class, Direction.BOTH, KNOWS));
+        GafferPopVertexStep<Vertex> yetAnotherListStep = new GafferPopVertexStep<>(
+                new VertexStep<>(otherTraversal, Vertex.class, Direction.BOTH));
+
+        assertThat(listStep)
+                .isEqualTo(otherListStep)
+                .isNotEqualTo(null)
+                .isNotEqualTo(vertexStep)
+                .isNotEqualTo(yetAnotherListStep);
+    }
+
+    @Test
+    void shouldConfigureParameters() throws Exception {
+        VertexStep<Vertex> vertexStep = new VertexStep<>(traversal, Vertex.class, Direction.BOTH, KNOWS);
+        try (GafferPopVertexStep<Vertex> listStep = new GafferPopVertexStep<>(vertexStep)) {
+            listStep.configure("key", "value");
+
+            Parameters params = new Parameters();
+            params.set(null, "key", "value");
+            assertThat(listStep.getParameters()).hasSameHashCodeAs(params);
+        }
+    }
+
+    @Test
+    void shouldGetDirection() throws Exception {
+        VertexStep<Vertex> vertexStep = new VertexStep<>(traversal, Vertex.class, Direction.BOTH, KNOWS);
+        try (GafferPopVertexStep<Vertex> listStep = new GafferPopVertexStep<>(vertexStep)) {
+            assertThat(listStep.getDirection()).isEqualTo(Direction.BOTH);
+        }
+    }
+
+    @Test
+    void shouldReverseDirection() throws Exception {
+        VertexStep<Vertex> vertexStep = new VertexStep<>(traversal, Vertex.class, Direction.OUT, KNOWS);
+        try (GafferPopVertexStep<Vertex> listStep = new GafferPopVertexStep<>(vertexStep)) {
+            listStep.reverseDirection();
+            assertThat(listStep.getDirection()).isEqualTo(Direction.IN);
+        }
+    }
+
+    @Test
+    void shouldReturnVertex() throws Exception {
+        VertexStep<Vertex> vertexStep = new VertexStep<>(traversal, Vertex.class, Direction.OUT, KNOWS);
+        try (GafferPopVertexStep<Vertex> listStep = new GafferPopVertexStep<>(vertexStep)) {
+            assertThat(listStep.returnsVertex()).isTrue();
+            assertThat(listStep.returnsEdge()).isFalse();
+        }
+    }
+
+    @Test
+    void shouldHaveToString() throws Exception {
+        VertexStep<Vertex> vertexStep = new VertexStep<>(traversal, Vertex.class, Direction.OUT, KNOWS);
+        try (GafferPopVertexStep<Vertex> listStep = new GafferPopVertexStep<>(vertexStep)) {
+            assertThat(listStep).hasToString("GafferPopVertexStep(OUT,[knows],vertex)");
+        }
+    }
+
+    @Test
+    void shouldGetEdgeLabels() throws Exception {
+        VertexStep<Vertex> vertexStep = new VertexStep<>(traversal, Vertex.class, Direction.OUT, KNOWS);
+        try (GafferPopVertexStep<Vertex> listStep = new GafferPopVertexStep<>(vertexStep)) {
+            assertThat(listStep.getEdgeLabels()).containsExactly(KNOWS);
+        }
+    }
+
+    @Test
+    void shouldGetReturnClass() throws Exception {
+        VertexStep<Vertex> vertexStep = new VertexStep<>(traversal, Vertex.class, Direction.OUT, KNOWS);
+        try (GafferPopVertexStep<Vertex> listStep = new GafferPopVertexStep<>(vertexStep)) {
+            assertThat(listStep.getReturnClass()).isEqualTo(Vertex.class);
+        }
+    }
+}
diff --git a/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/util/GafferPopTestUtil.java b/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/util/GafferPopTestUtil.java
index 44e1706ac80..e9593351b39 100644
--- a/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/util/GafferPopTestUtil.java
+++ b/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/util/GafferPopTestUtil.java
@@ -60,7 +60,7 @@ private GafferPopTestUtil() {
             this.setProperty(GafferPopGraph.DATA_AUTHS, new String[]{AUTH_1, AUTH_2});
             this.setProperty(GafferPopGraph.GRAPH_ID, "Graph1");
             this.setProperty(GafferPopGraph.STORE_PROPERTIES, GafferPopTestUtil.class.getClassLoader().getResource("gaffer/store.properties").getPath());
-            this.setProperty(GafferPopGraph.GET_ALL_ELEMENTS_LIMIT, 1);
+            this.setProperty(GafferPopGraph.GET_ELEMENTS_LIMIT, 1);
             this.setProperty(GafferPopGraph.HAS_STEP_FILTER_STAGE, "POST_TRANSFORM");
         }
     };
diff --git a/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/util/modern/GafferPopModernFederatedTestUtils.java b/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/util/modern/GafferPopModernFederatedTestUtils.java
index c25b8a52c07..7f025e84126 100644
--- a/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/util/modern/GafferPopModernFederatedTestUtils.java
+++ b/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/util/modern/GafferPopModernFederatedTestUtils.java
@@ -23,6 +23,7 @@
 import uk.gov.gchq.gaffer.data.element.Entity;
 import uk.gov.gchq.gaffer.federatedstore.operation.AddGraph;
 import uk.gov.gchq.gaffer.federatedstore.operation.FederatedOperation;
+
 import uk.gov.gchq.gaffer.graph.Graph;
 import uk.gov.gchq.gaffer.graph.GraphConfig;
 import uk.gov.gchq.gaffer.operation.OperationException;
@@ -66,9 +67,7 @@ private GafferPopModernFederatedTestUtils() {
     public static GafferPopGraph createModernGraph(Class<?> clazz, StoreType storeType) throws OperationException {
         CacheServiceLoader.shutdown();
         Graph g = setUpFederatedGraph(clazz, GafferPopTestUtil.getStoreProperties(storeType));
-        GafferPopGraph graph = GafferPopGraph.open(MODERN_CONFIGURATION, g);
-
-        return graph;
+        return GafferPopGraph.open(MODERN_CONFIGURATION, g);
     }
 
     private static Graph setUpFederatedGraph(Class<?> clazz, StoreProperties properties) throws OperationException {
diff --git a/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/util/modern/GafferPopModernSimpleFederatedTestUtils.java b/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/util/modern/GafferPopModernSimpleFederatedTestUtils.java
new file mode 100644
index 00000000000..51f91503b6c
--- /dev/null
+++ b/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/util/modern/GafferPopModernSimpleFederatedTestUtils.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.tinkerpop.util.modern;
+
+import uk.gov.gchq.gaffer.cache.CacheServiceLoader;
+import uk.gov.gchq.gaffer.commonutil.StreamUtil;
+import uk.gov.gchq.gaffer.data.element.Edge;
+import uk.gov.gchq.gaffer.data.element.Element;
+import uk.gov.gchq.gaffer.data.element.Entity;
+import uk.gov.gchq.gaffer.federated.simple.FederatedStoreProperties;
+import uk.gov.gchq.gaffer.federated.simple.operation.AddGraph;
+import uk.gov.gchq.gaffer.federated.simple.operation.handler.FederatedOperationHandler;
+import uk.gov.gchq.gaffer.graph.Graph;
+import uk.gov.gchq.gaffer.graph.GraphConfig;
+import uk.gov.gchq.gaffer.operation.OperationException;
+import uk.gov.gchq.gaffer.operation.impl.add.AddElements;
+import uk.gov.gchq.gaffer.store.Context;
+import uk.gov.gchq.gaffer.store.StoreProperties;
+import uk.gov.gchq.gaffer.store.schema.Schema;
+import uk.gov.gchq.gaffer.tinkerpop.GafferPopGraph;
+import uk.gov.gchq.gaffer.tinkerpop.util.GafferPopTestUtil;
+import uk.gov.gchq.gaffer.tinkerpop.util.GafferPopTestUtil.StoreType;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.CREATED;
+import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.JOSH;
+import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.KNOWS;
+import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.LOP;
+import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.MARKO;
+import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.MODERN_CONFIGURATION;
+import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.PETER;
+import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.RIPPLE;
+import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.VADAS;
+import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.WEIGHT;
+
+public final class GafferPopModernSimpleFederatedTestUtils {
+
+    public static final String FEDERATED_GRAPH_ID = "simpleFederatedGraph";
+    public static final String CREATED_GRAPH_ID = "createdGraph";
+    public static final String KNOWS_GRAPH_ID = "knowsGraph";
+    private static final Context CONTEXT = new Context();
+    private static final FederatedStoreProperties SIMPLE_FEDERATED_STORE_PROPERTIES = FederatedStoreProperties
+        .loadStoreProperties("/federatedStore/simple-fed-store.properties");
+
+    private GafferPopModernSimpleFederatedTestUtils() {
+    }
+
+    /*
+     * Creates a simple federated graph of the Tinkerpop Modern dataset containing two subgraphs
+     * One graph contains all the 'knows' edges, the other the 'created' edges
+     */
+    public static GafferPopGraph createModernGraph(Class<?> clazz, StoreType storeType) throws OperationException {
+        CacheServiceLoader.shutdown();
+        Graph g = setUpSimpleFederatedGraph(clazz, GafferPopTestUtil.getStoreProperties(storeType));
+        return GafferPopGraph.open(MODERN_CONFIGURATION, g);
+    }
+
+    private static Graph setUpSimpleFederatedGraph(Class<?> clazz, StoreProperties properties) throws OperationException {
+        final Graph simpleFederatedGraph = new Graph.Builder()
+                .config(new GraphConfig.Builder()
+                        .graphId(FEDERATED_GRAPH_ID)
+                        .build())
+                .addStoreProperties(SIMPLE_FEDERATED_STORE_PROPERTIES)
+                .build();
+
+        simpleFederatedGraph.execute(
+            new AddGraph.Builder()
+                .graphConfig(new GraphConfig(KNOWS_GRAPH_ID))
+                .schema(Schema.fromJson(StreamUtil.openStreams(clazz, "/gaffer/schema")))
+                .properties(properties.getProperties())
+                .build(), CONTEXT);
+
+        simpleFederatedGraph.execute(
+            new AddGraph.Builder()
+                .graphConfig(new GraphConfig(CREATED_GRAPH_ID))
+                .schema(Schema.fromJson(StreamUtil.openStreams(clazz, "/gaffer/schema")))
+                .properties(properties.getProperties())
+                .build(), CONTEXT);
+
+        setupKnowsGraph(simpleFederatedGraph);
+        setupCreatedGraph(simpleFederatedGraph);
+
+        return simpleFederatedGraph;
+    }
+
+    private static void setupKnowsGraph(final Graph federatedGraph) throws OperationException {
+        List<Element> knowsGraphElements = Stream.of(MARKO, VADAS, JOSH)
+                .map((Person p) -> {
+                    Entity personEntity = p.toEntity();
+                    List<Element> personElements = p.getKnows()
+                            .stream()
+                            .map(e -> getEdge(p, e.getFirst(), e.getSecond()))
+                            .collect(Collectors.toList());
+                    personElements.add(personEntity);
+                    return personElements;
+                })
+                .flatMap(List::stream)
+                .collect(Collectors.toList());
+
+        federatedGraph.execute(new AddElements.Builder()
+                        .input(knowsGraphElements.toArray(new Element[0]))
+                        .option(FederatedOperationHandler.OPT_GRAPH_IDS, KNOWS_GRAPH_ID)
+                        .build(), CONTEXT);
+    }
+
+    private static void setupCreatedGraph(final Graph federatedGraph) throws OperationException {
+        List<Element> createdGraphElements = Stream.of(MARKO, JOSH, PETER)
+                .map((Person p) -> {
+                    Entity personEntity = p.toEntity();
+                    List<Element> personElements = p.getCreated()
+                            .stream()
+                            .map(e -> getEdge(p, e.getFirst(), e.getSecond()))
+                            .collect(Collectors.toList());
+                    personElements.add(personEntity);
+                    return personElements;
+                })
+                .flatMap(List::stream)
+                .collect(Collectors.toList());
+
+        createdGraphElements.add(LOP.toEntity());
+        createdGraphElements.add(RIPPLE.toEntity());
+
+        federatedGraph.execute(new AddElements.Builder()
+                        .input(createdGraphElements.toArray(new Element[0]))
+                        .option(FederatedOperationHandler.OPT_GRAPH_IDS, CREATED_GRAPH_ID)
+                        .build(), CONTEXT);
+    }
+
+    private static Edge getEdge(Person from, Person to, double weight) {
+        return new Edge.Builder()
+                .group(KNOWS)
+                .source(from.getId())
+                .dest(to.getId())
+                .directed(true)
+                .property(WEIGHT, weight)
+                .build();
+    }
+
+    private static Edge getEdge(Person from, Software to, double weight) {
+        return new Edge.Builder()
+                .group(CREATED)
+                .source(from.getId())
+                .dest(to.getId())
+                .directed(true)
+                .property(WEIGHT, weight)
+                .build();
+    }
+
+}
diff --git a/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/util/modern/Person.java b/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/util/modern/Person.java
index f33f90474fe..8fc09924c1e 100644
--- a/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/util/modern/Person.java
+++ b/library/tinkerpop/src/test/java/uk/gov/gchq/gaffer/tinkerpop/util/modern/Person.java
@@ -17,9 +17,12 @@
 package uk.gov.gchq.gaffer.tinkerpop.util.modern;
 
 import org.apache.tinkerpop.gremlin.structure.T;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
 
 import uk.gov.gchq.gaffer.commonutil.pair.Pair;
 import uk.gov.gchq.gaffer.data.element.Entity;
+import uk.gov.gchq.gaffer.tinkerpop.GafferPopGraph;
+import uk.gov.gchq.gaffer.tinkerpop.generator.GafferPopVertexGenerator;
 
 import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.AGE;
 import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.NAME;
@@ -163,4 +166,8 @@ public Entity toEntity() {
                 .property(AGE, age)
                 .build();
     }
+
+    public Vertex toVertex(GafferPopGraph graph) {
+        return new GafferPopVertexGenerator(graph)._apply(toEntity());
+    }
 }
diff --git a/library/tinkerpop/src/test/resources/federatedStore/simple-fed-store.properties b/library/tinkerpop/src/test/resources/federatedStore/simple-fed-store.properties
new file mode 100644
index 00000000000..410babfdfde
--- /dev/null
+++ b/library/tinkerpop/src/test/resources/federatedStore/simple-fed-store.properties
@@ -0,0 +1,21 @@
+#
+# Copyright 2024 Crown Copyright
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+gaffer.store.class=uk.gov.gchq.gaffer.federated.simple.FederatedStore
+gaffer.store.properties.class=uk.gov.gchq.gaffer.federated.simple.FederatedStoreProperties
+gaffer.store.federated.default.aggregateElements=true
+gaffer.store.federated.default.graphIds=knowsGraph,createdGraph
+gaffer.cache.service.default.class=uk.gov.gchq.gaffer.cache.impl.HashMapCacheService
diff --git a/library/tinkerpop/src/test/resources/gafferpop-test.properties b/library/tinkerpop/src/test/resources/gafferpop-test.properties
index 660ea904779..b2a7d349ef0 100644
--- a/library/tinkerpop/src/test/resources/gafferpop-test.properties
+++ b/library/tinkerpop/src/test/resources/gafferpop-test.properties
@@ -19,6 +19,6 @@ gaffer.storeproperties=src/test/resources/gaffer/store.properties
 gaffer.schemas=src/test/resources/gaffer/schema/
 gaffer.userId=user01
 gaffer.operation.options=key1:value1
-gaffer.elements.getalllimit=2
+gaffer.elements.getlimit=2
 gaffer.elements.hasstepfilterstage=POST_AGGREGATION
 
diff --git a/pom.xml b/pom.xml
index 56f4da83e47..a4625fba2ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
 
     <properties>
         <!-- CI/CD revision variable -->
-        <revision>2.3.0</revision>
+        <revision>2.3.1</revision>
 
         <disable.forking>false</disable.forking>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -73,7 +73,7 @@
         <clearspring.version>2.7.0</clearspring.version>
         <datasketches.version>4.0.0</datasketches.version>
         <commons-codec.version>1.15</commons-codec.version>
-        <commons-io.version>2.11.0</commons-io.version>
+        <commons-io.version>2.14.0</commons-io.version>
         <commons-lang3.version>3.12.0</commons-lang3.version>
         <commons-logging.version>1.2</commons-logging.version>
         <commons-math.version>2.2</commons-math.version>
diff --git a/rest-api/spring-rest/pom.xml b/rest-api/spring-rest/pom.xml
index 085e10e198a..8ac3d306f80 100644
--- a/rest-api/spring-rest/pom.xml
+++ b/rest-api/spring-rest/pom.xml
@@ -77,6 +77,11 @@
             <artifactId>federated-store</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
+        <dependency>
+            <groupId>uk.gov.gchq.gaffer</groupId>
+            <artifactId>simple-federated-store</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
         <dependency>
             <groupId>uk.gov.gchq.gaffer</groupId>
             <artifactId>accumulo-store</artifactId>
diff --git a/rest-api/spring-rest/src/main/java/uk/gov/gchq/gaffer/rest/GafferWebApplication.java b/rest-api/spring-rest/src/main/java/uk/gov/gchq/gaffer/rest/GafferWebApplication.java
index bc4790ee084..712d3b0ca0e 100644
--- a/rest-api/spring-rest/src/main/java/uk/gov/gchq/gaffer/rest/GafferWebApplication.java
+++ b/rest-api/spring-rest/src/main/java/uk/gov/gchq/gaffer/rest/GafferWebApplication.java
@@ -23,7 +23,7 @@
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 
 @OpenAPIDefinition(servers = {
-    @Server(url = "/", description = "Default Server URL") })
+    @Server(url = "${server.servlet.context-path}", description = "Default Server URL") })
 @SpringBootApplication
 public class GafferWebApplication extends SpringBootServletInitializer {
 
diff --git a/rest-api/spring-rest/src/main/java/uk/gov/gchq/gaffer/rest/config/GremlinConfig.java b/rest-api/spring-rest/src/main/java/uk/gov/gchq/gaffer/rest/config/GremlinConfig.java
index 452c37dad96..d9d09a36ce9 100644
--- a/rest-api/spring-rest/src/main/java/uk/gov/gchq/gaffer/rest/config/GremlinConfig.java
+++ b/rest-api/spring-rest/src/main/java/uk/gov/gchq/gaffer/rest/config/GremlinConfig.java
@@ -16,11 +16,11 @@
 
 package uk.gov.gchq.gaffer.rest.config;
 
+import org.apache.commons.configuration2.PropertiesConfiguration;
 import org.apache.commons.configuration2.builder.fluent.Configurations;
 import org.apache.commons.configuration2.ex.ConfigurationException;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
 import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Bean;
@@ -31,7 +31,6 @@
 
 @Configuration
 public class GremlinConfig {
-
     private static final Logger LOGGER = LoggerFactory.getLogger(GremlinConfig.class);
 
     /**
@@ -39,20 +38,47 @@ public class GremlinConfig {
      */
     private static final String DEFAULT_PROPERTIES = "/gaffer/gafferpop.properties";
 
+    /**
+     * Default timeout for executing gremlin queries (2 min).
+     */
+    private static final Long DEFAULT_REQUEST_TIMEOUT = 120000L;
+
+    /**
+     * Key for GafferPop properties file to specify the timeout on gremlin queries to the REST API.
+     */
+    private static final String REQUEST_TIMEOUT_KEY = "gaffer.rest.timeout";
+
     @Bean
-    public GraphTraversalSource graphTraversalSource(final GraphFactory graphFactory) throws Exception {
-        // Determine where to look for the GafferPop properties
-        String gafferPopProperties = graphFactory.getGraph().getStoreProperties().get(GafferPopGraph.GAFFERPOP_PROPERTIES);
-        if (gafferPopProperties == null) {
-            LOGGER.warn("GafferPop properties file was not specified. Using default location: {}", DEFAULT_PROPERTIES);
-            gafferPopProperties = DEFAULT_PROPERTIES;
-        }
+    public GraphTraversalSource graphTraversalSource(final GraphFactory graphFactory) {
         // Obtain the graph traversal
-        try (Graph graph = GafferPopGraph.open(new Configurations().properties(gafferPopProperties), graphFactory.getGraph())) {
-            return graph.traversal();
+        Graph graph = GafferPopGraph.open(findPropertiesFile(graphFactory), graphFactory.getGraph());
+        return graph.traversal();
+    }
+
+    @Bean
+    public Long requestTimeout(final GraphFactory graphFactory) {
+        return findPropertiesFile(graphFactory).getLong(REQUEST_TIMEOUT_KEY, DEFAULT_REQUEST_TIMEOUT);
+    }
+
+    /**
+     * Finds and loads the correct config file for gafferpop.
+     *
+     * @param graphFactory The graph factory.
+     * @return Loaded properties from file.
+     * @throws ConfigurationException If problem loading.
+     */
+    private PropertiesConfiguration findPropertiesFile(final GraphFactory graphFactory) {
+        try {
+            // Determine where to look for the GafferPop properties
+            String gafferPopProperties = graphFactory.getGraph().getStoreProperties().get(GafferPopGraph.GAFFERPOP_PROPERTIES);
+            if (gafferPopProperties == null) {
+                LOGGER.warn("GafferPop properties file was not specified. Using default location: {}", DEFAULT_PROPERTIES);
+                gafferPopProperties = DEFAULT_PROPERTIES;
+            }
+            return new Configurations().properties(gafferPopProperties);
         } catch (final ConfigurationException e) {
-            LOGGER.error("Error loading GafferPop config, Gremlin will be unavailable: {}", e.getMessage());
-            return EmptyGraph.instance().traversal();
+            LOGGER.warn("Using default values for GafferPop, failed to load a GafferPop config: {}", e.getMessage());
+            return new PropertiesConfiguration();
         }
     }
 }
diff --git a/rest-api/spring-rest/src/main/java/uk/gov/gchq/gaffer/rest/config/GremlinWebSocketConfig.java b/rest-api/spring-rest/src/main/java/uk/gov/gchq/gaffer/rest/config/GremlinWebSocketConfig.java
index f7ebd01029b..8877af1bb60 100644
--- a/rest-api/spring-rest/src/main/java/uk/gov/gchq/gaffer/rest/config/GremlinWebSocketConfig.java
+++ b/rest-api/spring-rest/src/main/java/uk/gov/gchq/gaffer/rest/config/GremlinWebSocketConfig.java
@@ -32,16 +32,18 @@ public class GremlinWebSocketConfig implements WebSocketConfigurer {
 
     private final GraphTraversalSource g;
     private final AbstractUserFactory userFactory;
+    private final Long requestTimeout;
 
     @Autowired
-    public GremlinWebSocketConfig(final GraphTraversalSource g, final AbstractUserFactory userFactory) {
+    public GremlinWebSocketConfig(final GraphTraversalSource g, final AbstractUserFactory userFactory, final Long requestTimeout) {
         this.g = g;
         this.userFactory = userFactory;
+        this.requestTimeout = requestTimeout;
     }
 
     @Override
     public void registerWebSocketHandlers(final WebSocketHandlerRegistry registry) {
-        registry.addHandler(new GremlinWebSocketHandler(g, userFactory), "/gremlin");
+        registry.addHandler(new GremlinWebSocketHandler(g, userFactory, requestTimeout), "/gremlin");
     }
 
 }
diff --git a/rest-api/spring-rest/src/main/java/uk/gov/gchq/gaffer/rest/controller/GraphConfigurationController.java b/rest-api/spring-rest/src/main/java/uk/gov/gchq/gaffer/rest/controller/GraphConfigurationController.java
index 647abc722f9..3dc1c4ee339 100644
--- a/rest-api/spring-rest/src/main/java/uk/gov/gchq/gaffer/rest/controller/GraphConfigurationController.java
+++ b/rest-api/spring-rest/src/main/java/uk/gov/gchq/gaffer/rest/controller/GraphConfigurationController.java
@@ -84,6 +84,12 @@ public String getGraphId() {
         return graphFactory.getGraph().getGraphId();
     }
 
+    @GetMapping(path = "/graphCreatedTime", produces = TEXT_PLAIN_VALUE)
+    @Operation(summary = "Gets the creation time for the store associated with this REST API")
+    public String getGraphCreatedTime() {
+        return graphFactory.getGraph().getCreatedTime();
+    }
+
     @GetMapping(path = "/filterFunctions", produces = APPLICATION_JSON_VALUE)
     @Operation(summary = "Gets the available filter functions")
     public Set<Class> getFilterFunctions() {
diff --git a/rest-api/spring-rest/src/main/java/uk/gov/gchq/gaffer/rest/controller/GremlinController.java b/rest-api/spring-rest/src/main/java/uk/gov/gchq/gaffer/rest/controller/GremlinController.java
index ba763b88d22..14f387ffce0 100644
--- a/rest-api/spring-rest/src/main/java/uk/gov/gchq/gaffer/rest/controller/GremlinController.java
+++ b/rest-api/spring-rest/src/main/java/uk/gov/gchq/gaffer/rest/controller/GremlinController.java
@@ -16,24 +16,39 @@
 
 package uk.gov.gchq.gaffer.rest.controller;
 
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.StatusCode;
+import io.opentelemetry.context.Context;
+import io.opentelemetry.context.Scope;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor;
 import org.apache.tinkerpop.gremlin.jsr223.ConcurrentBindings;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
 import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONWriter;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV3;
 import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
 import org.json.JSONObject;
 import org.opencypher.gremlin.server.jsr223.CypherPlugin;
 import org.opencypher.gremlin.translation.CypherAst;
 import org.opencypher.gremlin.translation.translator.Translator;
+import org.opencypher.v9_0.util.SyntaxException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;
 
+import uk.gov.gchq.gaffer.commonutil.otel.OtelUtil;
 import uk.gov.gchq.gaffer.core.exception.GafferRuntimeException;
 import uk.gov.gchq.gaffer.exception.SerialisationException;
 import uk.gov.gchq.gaffer.jsonserialisation.JSONSerialiser;
@@ -42,35 +57,62 @@
 import uk.gov.gchq.gaffer.rest.factory.spring.AbstractUserFactory;
 import uk.gov.gchq.gaffer.tinkerpop.GafferPopGraph;
 import uk.gov.gchq.gaffer.tinkerpop.GafferPopGraphVariables;
+import uk.gov.gchq.gaffer.user.User;
+import uk.gov.gchq.koryphe.tuple.n.Tuple2;
 
+import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
+import static org.springframework.http.MediaType.APPLICATION_NDJSON;
+import static org.springframework.http.MediaType.APPLICATION_NDJSON_VALUE;
 import static org.springframework.http.MediaType.TEXT_PLAIN_VALUE;
 
 @RestController
 @Tag(name = "gremlin")
 @RequestMapping("/rest/gremlin")
 public class GremlinController {
+    /**
+     * The mapper for converting to GraphSONv3.
+     */
+    public static final GraphSONMapper GRAPHSON_V3_MAPPER = GraphSONMapper.build()
+            .version(GraphSONVersion.V3_0)
+            .addCustomModule(GraphSONXModuleV3.build()).create();
 
-    // Keys for response JSON
+    /**
+     * Writer for writing GraphSONv3 output to output streams.
+     */
+    public static final GraphSONWriter GRAPHSON_V3_WRITER = GraphSONWriter.build()
+            .mapper(GRAPHSON_V3_MAPPER)
+            .wrapAdjacencyList(true).create();
+
+    // Keys for response explain JSON
     public static final String EXPLAIN_OVERVIEW_KEY = "overview";
     public static final String EXPLAIN_OP_CHAIN_KEY = "chain";
     public static final String EXPLAIN_GREMLIN_KEY = "gremlin";
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(GremlinController.class);
+    private static final String GENERAL_ERROR_MSG = "Failed to evaluate Gremlin query: ";
+
     private final ConcurrentBindings bindings = new ConcurrentBindings();
+    private final ExecutorService executorService = Context.taskWrapping(Executors.newFixedThreadPool(4));
+    private final Long requestTimeout;
     private final AbstractUserFactory userFactory;
     private final Graph graph;
     private final Map<String, Map<String, Object>> plugins = new HashMap<>();
 
     @Autowired
-    public GremlinController(final GraphTraversalSource g, final AbstractUserFactory userFactory) {
+    public GremlinController(final GraphTraversalSource g, final AbstractUserFactory userFactory, final Long requestTimeout) {
         bindings.putIfAbsent("g", g);
         graph = g.getGraph();
         this.userFactory = userFactory;
+        this.requestTimeout = requestTimeout;
         // Add cypher plugin so cypher functions can be used in queries
         plugins.put(CypherPlugin.class.getName(), new HashMap<>());
     }
@@ -87,7 +129,45 @@ public GremlinController(final GraphTraversalSource g, final AbstractUserFactory
         summary = "Explain a Gremlin Query",
         description = "Runs a Gremlin query and outputs an explanation of what Gaffer operations were executed on the graph")
     public String explain(@RequestHeader final HttpHeaders httpHeaders, @RequestBody final String gremlinQuery) {
-        return runGremlinAndGetExplain(gremlinQuery, httpHeaders).toString();
+        preExecuteSetUp(httpHeaders);
+        return runGremlinQuery(gremlinQuery).get1().toString();
+    }
+
+    /**
+     * Endpoint for running a gremlin groovy query, will respond with an output
+     * stream of GraphSONv3 JSON.
+     *
+     * @param httpHeaders  The request headers.
+     * @param gremlinQuery The gremlin groovy query.
+     * @return A response output stream of GraphSONv3.
+     *
+     * @throws IOException If issue writing output.
+     */
+    @PostMapping(path = "/execute", consumes = TEXT_PLAIN_VALUE, produces = APPLICATION_NDJSON_VALUE)
+    @io.swagger.v3.oas.annotations.Operation(
+        summary = "Run a Gremlin Query",
+        description = "Runs a Gremlin Groovy script and outputs the result as GraphSONv3 JSON")
+    public ResponseEntity<StreamingResponseBody> execute(
+            @RequestHeader final HttpHeaders httpHeaders,
+            @RequestBody final String gremlinQuery) throws IOException {
+        // Set up
+        preExecuteSetUp(httpHeaders);
+
+        HttpStatus status = HttpStatus.OK;
+        StreamingResponseBody responseBody;
+        try {
+            Object result = runGremlinQuery(gremlinQuery).get0();
+            // Write to output stream for response
+            responseBody = os -> GRAPHSON_V3_WRITER.writeObject(os, result);
+        } catch (final GafferRuntimeException e) {
+            status = HttpStatus.INTERNAL_SERVER_ERROR;
+            responseBody = os -> os.write(
+                new JSONObject().put("simpleMessage", e.getMessage()).toString().getBytes(StandardCharsets.UTF_8));
+        }
+
+        return ResponseEntity.status(status)
+                .contentType(APPLICATION_NDJSON)
+                .body(responseBody);
     }
 
     /**
@@ -109,11 +189,56 @@ public String cypherExplain(@RequestHeader final HttpHeaders httpHeaders, @Reque
         // Translate the cypher to gremlin, always add a .toList() otherwise Gremlin wont execute it as its lazy
         final String translation = ast.buildTranslation(Translator.builder().gremlinGroovy().enableCypherExtensions().build()) + ".toList()";
 
-        JSONObject response = runGremlinAndGetExplain(translation, httpHeaders);
+        JSONObject response = runGremlinQuery(translation).get1();
         response.put(EXPLAIN_GREMLIN_KEY, translation);
         return response.toString();
     }
 
+    /**
+     * Endpoint for running a cypher query through gremlin, will respond with an
+     * output stream of GraphSONv3 JSON.
+     *
+     * @param httpHeaders The request headers.
+     * @param cypherQuery The cypher query.
+     * @return The output stream of GraphSONv3.
+     *
+     * @throws IOException If issue writing output.
+     */
+    @PostMapping(path = "/cypher/execute", consumes = TEXT_PLAIN_VALUE, produces = APPLICATION_NDJSON_VALUE)
+    @io.swagger.v3.oas.annotations.Operation(
+        summary = "Run a Cypher Query",
+        description = "Translates a Cypher query to Gremlin and executes it returning a GraphSONv3 JSON result." +
+                      "Note will always append a '.toList()' to the translation")
+    public ResponseEntity<StreamingResponseBody> cypherExecute(
+            @RequestHeader final HttpHeaders httpHeaders,
+            @RequestBody final String cypherQuery) throws IOException {
+        // Set up
+        preExecuteSetUp(httpHeaders);
+
+
+        HttpStatus status = HttpStatus.OK;
+        StreamingResponseBody responseBody;
+        try {
+            final CypherAst ast = CypherAst.parse(cypherQuery);
+            // Translate the cypher to gremlin, always add a .toList() otherwise Gremlin
+            // wont execute it as its lazy
+            final String translation = ast.buildTranslation(
+                Translator.builder().gremlinGroovy().enableCypherExtensions().build()) + ".toList()";
+            // Run Query
+            Object result = runGremlinQuery(translation).get0();
+            // Write to output stream for response
+            responseBody = os -> GRAPHSON_V3_WRITER.writeObject(os, result);
+        } catch (final GafferRuntimeException | SyntaxException e) {
+            status = HttpStatus.INTERNAL_SERVER_ERROR;
+            responseBody = os -> os.write(
+                new JSONObject().put("simpleMessage", e.getMessage()).toString().getBytes(StandardCharsets.UTF_8));
+        }
+
+        return ResponseEntity.status(status)
+                .contentType(APPLICATION_NDJSON)
+                .body(responseBody);
+    }
+
     /**
      * Gets an explanation of the last chain of operations ran on a GafferPop graph.
      * This essentially shows how a Gremlin query mapped to a Gaffer operation
@@ -154,14 +279,12 @@ public static JSONObject getGafferPopExplanation(final GafferPopGraph graph) {
     }
 
     /**
-     * Executes a given Gremlin query on the graph then formats a JSON response with
-     * the executed Gaffer operations in.
+     * Do some basic pre execute set up so the graph is ready for the gremlin
+     * request to be executed.
      *
-     * @param gremlinQuery The Gremlin groovy query.
-     * @param httpHeaders The headers for the request.
-     * @return JSON explanation.
+     * @param httpHeaders Headers for user auth
      */
-    private JSONObject runGremlinAndGetExplain(final String gremlinQuery, final HttpHeaders httpHeaders) {
+    private void preExecuteSetUp(final HttpHeaders httpHeaders) {
         // Check we actually have a graph instance to use
         GafferPopGraph gafferPopGraph;
         if (graph instanceof EmptyGraph) {
@@ -173,25 +296,80 @@ private JSONObject runGremlinAndGetExplain(final String gremlinQuery, final Http
         // Hooks for user auth
         userFactory.setHttpHeaders(httpHeaders);
         graph.variables().set(GafferPopGraphVariables.USER, userFactory.createUser());
+    }
 
-        JSONObject explain = new JSONObject();
-        try (GremlinExecutor gremlinExecutor = GremlinExecutor.build()
-                .addPlugins("gremlin-groovy", plugins)
-                .globalBindings(bindings).create()) {
-            // Execute the query note this will actually run the query which we need
-            // as Gremlin will skip steps if there is no input from the previous ones
-            gremlinExecutor.eval(gremlinQuery).join();
+    /**
+     * Executes a given Gremlin query and returns the result along with an explanation.
+     *
+     * @param gremlinQuery The Gremlin groovy query.
+     * @return A pair tuple with result and explain in.
+     */
+    private Tuple2<Object, JSONObject> runGremlinQuery(final String gremlinQuery) {
+        GafferPopGraph gafferPopGraph = (GafferPopGraph) graph;
+
+        // OpenTelemetry hooks
+        Span span = OtelUtil.startSpan(
+            this.getClass().getName(), "Gremlin Request: " + UUID.nameUUIDFromBytes(gremlinQuery.getBytes(StandardCharsets.UTF_8)));
+        span.setAttribute(OtelUtil.GREMLIN_QUERY_ATTRIBUTE, gremlinQuery);
+
+        User user = ((GafferPopGraphVariables) gafferPopGraph.variables()).getUser();
+        String userId;
+        if (user != null) {
+            userId = user.getUserId();
+        } else {
+            LOGGER.warn("Could not find Gaffer user for OTEL. Using default.");
+            userId = "unknownGremlinUser";
+        }
+        span.setAttribute(OtelUtil.USER_ATTRIBUTE, userId);
+
+        // tuple to hold the result and explain
+        Tuple2<Object, JSONObject> pair = new Tuple2<>();
+        pair.put1(new JSONObject());
+
+        try (Scope scope = span.makeCurrent();
+                GremlinExecutor gremlinExecutor = getGremlinExecutor()) {
+            // Execute the query
+            Object result = gremlinExecutor.eval(gremlinQuery).get();
 
-            // Get the chain and reset the variables
-            explain = getGafferPopExplanation(gafferPopGraph);
+            // Store the result and explain for returning
+            pair.put0(result);
+            pair.put1(getGafferPopExplanation(gafferPopGraph));
+
+            // Provide an debug explanation for the query that just ran
+            span.addEvent("Request complete");
+            LOGGER.debug("{}", pair.get1());
+
+            // Reset the vars
             gafferPopGraph.setDefaultVariables((GafferPopGraphVariables) gafferPopGraph.variables());
+
         } catch (final InterruptedException e) {
             Thread.currentThread().interrupt();
+            span.setStatus(StatusCode.ERROR, e.getMessage());
+            span.recordException(e);
+            throw new GafferRuntimeException(GENERAL_ERROR_MSG + e.getMessage(), e);
         } catch (final Exception e) {
-            throw new GafferRuntimeException("Failed to evaluate Gremlin query: " + e.getMessage(), e);
+            span.setStatus(StatusCode.ERROR, e.getMessage());
+            span.recordException(e);
+            throw new GafferRuntimeException(GENERAL_ERROR_MSG + e.getMessage(), e);
+        }  finally {
+            span.end();
         }
 
-        return explain;
+        return pair;
+    }
+
+    /**
+     * Returns a new gremlin executor. It's the responsibility of the caller to
+     * ensure it is closed.
+     *
+     * @return Gremlin executor.
+     */
+    private GremlinExecutor getGremlinExecutor() {
+        return GremlinExecutor.build()
+                .addPlugins("gremlin-groovy", plugins)
+                .evaluationTimeout(requestTimeout)
+                .executorService(executorService)
+                .globalBindings(bindings).create();
     }
 
 }
diff --git a/rest-api/spring-rest/src/main/java/uk/gov/gchq/gaffer/rest/controller/OperationController.java b/rest-api/spring-rest/src/main/java/uk/gov/gchq/gaffer/rest/controller/OperationController.java
index 2acbfbc6ad5..0d6e3ce0241 100644
--- a/rest-api/spring-rest/src/main/java/uk/gov/gchq/gaffer/rest/controller/OperationController.java
+++ b/rest-api/spring-rest/src/main/java/uk/gov/gchq/gaffer/rest/controller/OperationController.java
@@ -18,6 +18,8 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.ExampleObject;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -151,9 +153,63 @@ public Operation getOperationExample(@PathVariable("className") @Parameter(name
         }
     }
 
+    private static final String GET_ALL_ELEMENTS =
+            "{\n" +
+            "  \"class\": \"GetAllElements\"\n" +
+            "}";
+    private static final String GET_ELEMENTS =
+            "{\n" +
+            "  \"class\" : \"GetElements\",\n" +
+            "  \"input\" : [ {\n" +
+            "    \"class\" : \"EntitySeed\",\n" +
+            "    \"vertex\" : \"1\"\n" +
+            "  } ]\n" +
+            "}";
+    private static final String GET_ELEMENTS_WITH_VIEW =
+            "{\n" +
+            "  \"class\" : \"GetElements\",\n" +
+            "  \"input\" : [ {\n" +
+            "    \"class\" : \"EntitySeed\",\n" +
+            "    \"vertex\" : \"1\"\n" +
+            "  } ],\n" +
+            "  \"view\" : {\n" +
+            "    \"edges\" : {\n" +
+            "      \"created\" : {}\n" +
+            "    }\n" +
+            "  }\n" +
+            "}";
+    private static final String OPERATION_CHAIN =
+            "{\n" +
+            "  \"class\":\"OperationChain\",\n" +
+            "  \"operations\":[\n" +
+            "    {\n" +
+            "      \"class\":\"GetAdjacentIds\",\n" +
+            "      \"input\":[\n" +
+            "        {\n" +
+            "          \"class\":\"EntitySeed\",\n" +
+            "          \"vertex\":\"1\"\n" +
+            "        }\n" +
+            "      ]\n" +
+            "    },\n" +
+            "    {\n" +
+            "      \"class\":\"GetElements\",\n" +
+            "      \"view\":{\n" +
+            "        \"allEntities\":true\n" +
+            "      }\n" +
+            "    }\n" +
+            "  ]\n" +
+            "}";
+
     @PostMapping(path = "/execute", consumes = APPLICATION_JSON_VALUE, produces = APPLICATION_JSON_VALUE)
     @io.swagger.v3.oas.annotations.Operation(summary = "Executes an operation against a Store")
-    public ResponseEntity<Object> execute(@RequestHeader final HttpHeaders httpHeaders, @RequestBody final Operation operation) {
+    public ResponseEntity<Object> execute(@RequestHeader final HttpHeaders httpHeaders,
+            @io.swagger.v3.oas.annotations.parameters.RequestBody(required = true, content = @Content(examples = {
+                    @ExampleObject(name = "Get all elements", description = "Get all elements", value = GET_ALL_ELEMENTS),
+                    @ExampleObject(name = "Get elements with seed", description = "Get elements seeded with Vertex 1", value = GET_ELEMENTS),
+                    @ExampleObject(name = "Get edges with label", description = "Get all 'created' edges from Vertex 1", value = GET_ELEMENTS_WITH_VIEW),
+                    @ExampleObject(name = "Get adjacent vertices", description = "Get all vertices adjacent to Vertex 1", value = OPERATION_CHAIN),
+            }))
+            @RequestBody final Operation operation) {
         userFactory.setHttpHeaders(httpHeaders);
         final Pair<Object, String> resultAndJobId = _execute(operation, userFactory.createContext());
         return ResponseEntity.ok()
diff --git a/rest-api/spring-rest/src/main/java/uk/gov/gchq/gaffer/rest/handler/GremlinWebSocketHandler.java b/rest-api/spring-rest/src/main/java/uk/gov/gchq/gaffer/rest/handler/GremlinWebSocketHandler.java
index abd2885bf63..63865214d48 100644
--- a/rest-api/spring-rest/src/main/java/uk/gov/gchq/gaffer/rest/handler/GremlinWebSocketHandler.java
+++ b/rest-api/spring-rest/src/main/java/uk/gov/gchq/gaffer/rest/handler/GremlinWebSocketHandler.java
@@ -52,6 +52,7 @@
 import uk.gov.gchq.gaffer.rest.factory.spring.AbstractUserFactory;
 import uk.gov.gchq.gaffer.tinkerpop.GafferPopGraph;
 import uk.gov.gchq.gaffer.tinkerpop.GafferPopGraphVariables;
+import uk.gov.gchq.gaffer.user.User;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -88,6 +89,7 @@ public class GremlinWebSocketHandler extends BinaryWebSocketHandler {
 
     private final ExecutorService executorService = Context.taskWrapping(Executors.newFixedThreadPool(4));
     private final ConcurrentBindings bindings = new ConcurrentBindings();
+    private final Long requestTimeout;
     private final AbstractUserFactory userFactory;
     private final Graph graph;
     private final Map<String, Map<String, Object>> plugins = new HashMap<>();
@@ -97,11 +99,13 @@ public class GremlinWebSocketHandler extends BinaryWebSocketHandler {
      *
      * @param g The graph traversal source
      * @param userFactory The user factory
+     * @param requestTimeout The timeout for gremlin requests
      */
-    public GremlinWebSocketHandler(final GraphTraversalSource g, final AbstractUserFactory userFactory) {
+    public GremlinWebSocketHandler(final GraphTraversalSource g, final AbstractUserFactory userFactory, final Long requestTimeout) {
         bindings.putIfAbsent("g", g);
         graph = g.getGraph();
         this.userFactory = userFactory;
+        this.requestTimeout = requestTimeout;
         // Add cypher plugin so cypher functions can be used in queries
         plugins.put(CypherPlugin.class.getName(), new HashMap<>());
     }
@@ -142,18 +146,16 @@ private ResponseMessage handleGremlinRequest(final WebSocketSession session, fin
 
         // OpenTelemetry hooks
         Span span = OtelUtil.startSpan(this.getClass().getName(), "Gremlin Request: " + requestId.toString());
-        span.setAttribute("gaffer.gremlin.query", request.getArgs().get(Tokens.ARGS_GREMLIN).toString());
+        span.setAttribute(OtelUtil.GREMLIN_QUERY_ATTRIBUTE, request.getArgs().get(Tokens.ARGS_GREMLIN).toString());
 
         // Execute the query
         try (Scope scope = span.makeCurrent();
-                GremlinExecutor gremlinExecutor = GremlinExecutor.build()
-                        .globalBindings(bindings)
-                        .addPlugins("gremlin-groovy", plugins)
-                        .executorService(executorService)
-                        .create()) {
+                GremlinExecutor gremlinExecutor = getGremlinExecutor()) {
             // Set current headers for potential authorisation then set the user
             userFactory.setHttpHeaders(session.getHandshakeHeaders());
-            graph.variables().set(GafferPopGraphVariables.USER, userFactory.createUser());
+            User user = userFactory.createUser();
+            graph.variables().set(GafferPopGraphVariables.USER, user);
+            span.setAttribute(OtelUtil.USER_ATTRIBUTE, user.getUserId());
 
             // Run the query using the gremlin executor service
             Object result = gremlinExecutor.eval(
@@ -175,7 +177,6 @@ private ResponseMessage handleGremlinRequest(final WebSocketSession session, fin
             span.addEvent("Request complete");
             if (graph instanceof GafferPopGraph) {
                 JSONObject gafferOperationChain = GremlinController.getGafferPopExplanation((GafferPopGraph) graph);
-                span.setAttribute("gaffer.gremlin.explain", gafferOperationChain.toString());
                 LOGGER.debug("{}", gafferOperationChain);
             }
 
@@ -241,4 +242,19 @@ private ByteBuf convertToByteBuf(final BinaryMessage message) {
         }
     }
 
+    /**
+     * Returns a new gremlin executor. It's the responsibility of the caller to
+     * ensure it is closed.
+     *
+     * @return Gremlin executor.
+     */
+    private GremlinExecutor getGremlinExecutor() {
+        return GremlinExecutor.build()
+                .globalBindings(bindings)
+                .addPlugins("gremlin-groovy", plugins)
+                .evaluationTimeout(requestTimeout)
+                .executorService(executorService)
+                .create();
+    }
+
 }
diff --git a/rest-api/spring-rest/src/test/java/uk/gov/gchq/gaffer/rest/controller/GraphConfigurationControllerTest.java b/rest-api/spring-rest/src/test/java/uk/gov/gchq/gaffer/rest/controller/GraphConfigurationControllerTest.java
index 3dca9ccd0f0..96f6e957903 100644
--- a/rest-api/spring-rest/src/test/java/uk/gov/gchq/gaffer/rest/controller/GraphConfigurationControllerTest.java
+++ b/rest-api/spring-rest/src/test/java/uk/gov/gchq/gaffer/rest/controller/GraphConfigurationControllerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 Crown Copyright
+ * Copyright 2020-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,6 +46,7 @@
 import uk.gov.gchq.koryphe.impl.predicate.IsMoreThan;
 import uk.gov.gchq.koryphe.impl.predicate.Not;
 
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -53,8 +54,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -68,13 +67,13 @@ public class GraphConfigurationControllerTest {
     private GraphFactory graphFactory;
 
     @BeforeEach
-    public void initialiseMocks() {
+    void initialiseMocks() {
         MockitoAnnotations.initMocks(this);
         Mockito.reset(graphFactory);
     }
 
     @Test
-    public void shouldReturnDescription() {
+    void shouldReturnDescription() {
         // Given
         when(graphFactory.getGraph()).thenReturn(new Graph.Builder()
                 .config(new GraphConfig("id"))
@@ -89,11 +88,11 @@ public void shouldReturnDescription() {
         final String description = controller.getDescription();
 
         // Then
-        assertEquals("test graph", description);
+        assertThat(description).isEqualTo("test graph");
     }
 
     @Test
-    public void shouldReturnGraphId() {
+    void shouldReturnGraphId() {
         // Given
         when(graphFactory.getGraph()).thenReturn(new Graph.Builder()
                 .config(new GraphConfig("id"))
@@ -108,11 +107,11 @@ public void shouldReturnGraphId() {
         final String graphId = controller.getGraphId();
 
         // Then
-        assertEquals("id", graphId);
+        assertThat(graphId).isEqualTo("id");
     }
 
     @Test
-    public void shouldGetFilterFunctions() {
+    void shouldGetFilterFunctions() {
         // Given
         GraphConfigurationController controller = new GraphConfigurationController(graphFactory);
 
@@ -124,7 +123,7 @@ public void shouldGetFilterFunctions() {
     }
 
     @Test
-    public void shouldGetFilterFunctionsWithNullInput() {
+    void shouldGetFilterFunctionsWithNullInput() {
         // Given
         GraphConfigurationController controller = new GraphConfigurationController(graphFactory);
 
@@ -136,7 +135,7 @@ public void shouldGetFilterFunctionsWithNullInput() {
     }
 
     @Test
-    public void shouldGetFilterFunctionsWithInputClass() {
+    void shouldGetFilterFunctionsWithInputClass() {
         // Given
         GraphConfigurationController controller = new GraphConfigurationController(graphFactory);
 
@@ -148,7 +147,7 @@ public void shouldGetFilterFunctionsWithInputClass() {
     }
 
     @Test
-    public void shouldGetFilterFunctionsUsingShortClassName() {
+    void shouldGetFilterFunctionsUsingShortClassName() {
         // Given
         GraphConfigurationController controller = new GraphConfigurationController(graphFactory);
 
@@ -160,7 +159,7 @@ public void shouldGetFilterFunctionsUsingShortClassName() {
     }
 
     @Test
-    public void shouldThrowExceptionWhenGetFilterFunctionsWithUnknownClassName() {
+    void shouldThrowExceptionWhenGetFilterFunctionsWithUnknownClassName() {
         // Given
         GraphConfigurationController controller = new GraphConfigurationController(graphFactory);
 
@@ -171,7 +170,7 @@ public void shouldThrowExceptionWhenGetFilterFunctionsWithUnknownClassName() {
     }
 
     @Test
-    public void shouldGetSerialisedFields() {
+    void shouldGetSerialisedFields() {
         // Given
         GraphConfigurationController controller = new GraphConfigurationController(graphFactory);
 
@@ -184,7 +183,7 @@ public void shouldGetSerialisedFields() {
     }
 
     @Test
-    public void shouldGetSerialisedFieldsForGetElementsClass() {
+    void shouldGetSerialisedFieldsForGetElementsClass() {
         // Given
         GraphConfigurationController controller = new GraphConfigurationController(graphFactory);
 
@@ -200,11 +199,11 @@ public void shouldGetSerialisedFieldsForGetElementsClass() {
         expectedFields.add("views");
 
         // Then
-        assertEquals(expectedFields, fields);
+        assertThat(fields).isEqualTo(expectedFields);
     }
 
     @Test
-    public void shouldGetCorrectSerialisedFieldsForEdgeClass() {
+    void shouldGetCorrectSerialisedFieldsForEdgeClass() {
         // Given
         GraphConfigurationController controller = new GraphConfigurationController(graphFactory);
 
@@ -222,11 +221,11 @@ public void shouldGetCorrectSerialisedFieldsForEdgeClass() {
         expectedFields.put("directedType", String.class.getName());
 
         // Then
-        assertEquals(expectedFields, fields);
+        assertThat(fields).isEqualTo(expectedFields);
     }
 
     @Test
-    public void shouldGetCorrectSerialisedFieldsForGetWalksClass() {
+    void shouldGetCorrectSerialisedFieldsForGetWalksClass() {
         // Given
         GraphConfigurationController controller = new GraphConfigurationController(graphFactory);
 
@@ -242,11 +241,11 @@ public void shouldGetCorrectSerialisedFieldsForGetWalksClass() {
         expectedFields.put("conditional", "uk.gov.gchq.gaffer.operation.util.Conditional");
 
         // Then
-        assertEquals(expectedFields, fields);
+        assertThat(fields).isEqualTo(expectedFields);
     }
 
     @Test
-    public void shouldThrowExceptionWhenGetSerialisedFieldsWithUnknownClassName() {
+    void shouldThrowExceptionWhenGetSerialisedFieldsWithUnknownClassName() {
         // Given
         GraphConfigurationController controller = new GraphConfigurationController(graphFactory);
 
@@ -257,7 +256,7 @@ public void shouldThrowExceptionWhenGetSerialisedFieldsWithUnknownClassName() {
     }
 
     @Test
-    public void shouldReturnStoreType() {
+    void shouldReturnStoreType() {
         // Given
         when(graphFactory.getGraph()).thenReturn(new Graph.Builder()
             .config(new GraphConfig("id"))
@@ -275,7 +274,7 @@ public void shouldReturnStoreType() {
     }
 
     @Test
-    public void shouldGetStoreTraits() throws OperationException {
+    void shouldGetStoreTraits() throws OperationException {
         // Given
         Store store = mock(Store.class);
         Schema schema = new Schema();
@@ -299,11 +298,11 @@ public void shouldGetStoreTraits() throws OperationException {
         final Set<StoreTrait> traits = controller.getStoreTraits();
 
         // Then
-        assertEquals(MapStore.TRAITS, traits);
+        assertThat(traits).isEqualTo(MapStore.TRAITS);
     }
 
     @Test
-    public void shouldGetTransformFunctions() {
+    void shouldGetTransformFunctions() {
         // Given
         GraphConfigurationController controller = new GraphConfigurationController(graphFactory);
 
@@ -311,11 +310,11 @@ public void shouldGetTransformFunctions() {
         final Set<Class> classes = controller.getTransformFunctions();
 
         // Then
-        assertFalse(classes.isEmpty());
+        assertThat(classes).isNotEmpty();
     }
 
     @Test
-    public void shouldGetAggregationFunctions() {
+    void shouldGetAggregationFunctions() {
         // Given
         GraphConfigurationController controller = new GraphConfigurationController(graphFactory);
 
@@ -323,11 +322,11 @@ public void shouldGetAggregationFunctions() {
         final Set<Class> classes = controller.getAggregationFunctions();
 
         // Then
-        assertFalse(classes.isEmpty());
+        assertThat(classes).isNotEmpty();
     }
 
     @Test
-    public void shouldGetElementGenerators() {
+    void shouldGetElementGenerators() {
         // Given
         GraphConfigurationController controller = new GraphConfigurationController(graphFactory);
 
@@ -335,11 +334,11 @@ public void shouldGetElementGenerators() {
         final Set<Class> classes = controller.getElementGenerators();
 
         // Then
-        assertFalse(classes.isEmpty());
+        assertThat(classes).isNotEmpty();
     }
 
     @Test
-    public void shouldGetObjectGenerators() {
+    void shouldGetObjectGenerators() {
         // Given
         GraphConfigurationController controller = new GraphConfigurationController(graphFactory);
 
@@ -347,11 +346,11 @@ public void shouldGetObjectGenerators() {
         final Set<Class> classes = controller.getObjectGenerators();
 
         // Then
-        assertFalse(classes.isEmpty());
+        assertThat(classes).isNotEmpty();
     }
 
     @Test
-    public void shouldSerialiseAndDeserialiseGetStoreTraits() throws SerialisationException, OperationException {
+    void shouldSerialiseAndDeserialiseGetStoreTraits() throws SerialisationException, OperationException {
         // Given
         Store store = mock(Store.class);
 
@@ -382,12 +381,32 @@ public void shouldSerialiseAndDeserialiseGetStoreTraits() throws SerialisationEx
         final Set<String> traits = JSONSerialiser.deserialise(bytes, Set.class);
 
         // Then
-        assertEquals(Sets.newHashSet(
-                INGEST_AGGREGATION.name(),
-                PRE_AGGREGATION_FILTERING.name(),
-                POST_AGGREGATION_FILTERING.name()
-                ),
-                traits);
+        assertThat(traits).isEqualTo(Sets.newHashSet(
+            INGEST_AGGREGATION.name(),
+            PRE_AGGREGATION_FILTERING.name(),
+            POST_AGGREGATION_FILTERING.name()
+            ));
+    }
+    @Test
+    void shouldGetGraphCreatedTime() {
+        // Given
+        when(graphFactory.getGraph()).thenReturn(new Graph.Builder()
+                .config(new GraphConfig("id"))
+                .addSchema(new Schema())
+                .storeProperties(new MapStoreProperties())
+                .description("test graph")
+                .build());
+
+        // When
+        LocalDateTime time = LocalDateTime.now();
+        GraphConfigurationController controller = new GraphConfigurationController(graphFactory);
+
+        // When
+        final String graphCreatedTime = controller.getGraphCreatedTime();
+
+        // Then
+        assertThat(graphCreatedTime).isInstanceOf(String.class);
+        assertThat(LocalDateTime.parse(graphCreatedTime)).isBeforeOrEqualTo(time);
     }
 
 
diff --git a/rest-api/spring-rest/src/test/java/uk/gov/gchq/gaffer/rest/controller/GremlinControllerTest.java b/rest-api/spring-rest/src/test/java/uk/gov/gchq/gaffer/rest/controller/GremlinControllerTest.java
index 92c94f4a980..34387c8ef07 100644
--- a/rest-api/spring-rest/src/test/java/uk/gov/gchq/gaffer/rest/controller/GremlinControllerTest.java
+++ b/rest-api/spring-rest/src/test/java/uk/gov/gchq/gaffer/rest/controller/GremlinControllerTest.java
@@ -31,19 +31,24 @@
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
 
 import uk.gov.gchq.gaffer.operation.impl.Limit;
 import uk.gov.gchq.gaffer.operation.impl.get.GetAllElements;
 import uk.gov.gchq.gaffer.operation.impl.get.GetElements;
 import uk.gov.gchq.gaffer.rest.factory.spring.AbstractUserFactory;
 import uk.gov.gchq.gaffer.rest.factory.spring.UnknownUserFactory;
+import uk.gov.gchq.gaffer.tinkerpop.GafferPopGraph;
 import uk.gov.gchq.gaffer.tinkerpop.util.GafferPopTestUtil.StoreType;
 import uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils;
 
+import java.io.ByteArrayOutputStream;
+import java.io.OutputStream;
 import java.util.Arrays;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.http.MediaType.APPLICATION_NDJSON;
 import static org.springframework.http.MediaType.TEXT_PLAIN_VALUE;
 import static uk.gov.gchq.gaffer.tinkerpop.util.modern.GafferPopModernTestUtils.MARKO;
 
@@ -52,7 +57,9 @@
 @Import(GremlinControllerTest.TestConfig.class)
 class GremlinControllerTest {
 
+    private static final String GREMLIN_EXECUTE_ENDPOINT = "/rest/gremlin/execute";
     private static final String GREMLIN_EXPLAIN_ENDPOINT = "/rest/gremlin/explain";
+    private static final String CYPHER_EXECUTE_ENDPOINT = "/rest/gremlin/cypher/execute";
     private static final String CYPHER_EXPLAIN_ENDPOINT = "/rest/gremlin/cypher/explain";
 
     @TestConfiguration
@@ -67,6 +74,11 @@ public GraphTraversalSource g() {
         public AbstractUserFactory userFactory() {
             return new UnknownUserFactory();
         }
+
+        @Bean
+        public Long timeout() {
+            return 30000L;
+        }
     }
 
     @Autowired
@@ -75,11 +87,39 @@ public AbstractUserFactory userFactory() {
     @Autowired
     private GraphTraversalSource g;
 
+    @Test
+    void shouldExecuteValidGremlinQuery() throws Exception {
+        String gremlinString = "g.V('" + MARKO.getId() + "').toList()";
+
+        // Create the expected output
+        OutputStream expectedOutput = new ByteArrayOutputStream();
+        GremlinController.GRAPHSON_V3_WRITER.writeObject(expectedOutput, Arrays.asList(MARKO.toVertex((GafferPopGraph) g.getGraph())));
+
+        // When
+        MvcResult result = mockMvc
+            .perform(MockMvcRequestBuilders
+                .post(GREMLIN_EXECUTE_ENDPOINT)
+                .content(gremlinString)
+                .contentType(TEXT_PLAIN_VALUE)
+                .accept(APPLICATION_NDJSON))
+            .andExpect(MockMvcResultMatchers.request().asyncStarted())
+            .andReturn();
+        // Kick of the async dispatch so the result is available
+        mockMvc.perform(MockMvcRequestBuilders.asyncDispatch(result));
+
+        // Then
+        // Ensure OK response
+        assertThat(result.getResponse().getStatus()).isEqualTo(200);
+
+        // Get and check response
+        assertThat(result.getResponse().getContentAsString()).isEqualTo(expectedOutput.toString());
+    }
+
     @Test
     void shouldReturnExplainOfValidGremlinQuery() throws Exception {
         // Given
         String gremlinString = "g.V('" + MARKO.getId() + "').toList()";
-        List<String> expectedOperations = Arrays.asList(GetElements.class.getName());
+        List<String> expectedOperations = Arrays.asList(GetElements.class.getName(), Limit.class.getName());
 
         // When
         MvcResult result = mockMvc
@@ -106,7 +146,7 @@ void shouldReturnExplainOfValidGremlinQuery() throws Exception {
     }
 
     @Test
-    void shouldRejectMalformedGremlinQuery() throws Exception {
+    void shouldRejectMalformedGremlinQueryFromExplain() throws Exception {
         // Given
         String gremlinString = "g.V().stepDoesNotExist().toList()";
 
@@ -123,12 +163,88 @@ void shouldRejectMalformedGremlinQuery() throws Exception {
         assertThat(result.getResponse().getStatus()).isEqualTo(500);
     }
 
+    @Test
+    void shouldRejectMalformedGremlinQueryFromExecute() throws Exception {
+        // Given
+        String gremlinString = "g.V().stepDoesNotExist().toList()";
+
+        // When
+        MvcResult result = mockMvc
+                .perform(MockMvcRequestBuilders
+                        .post(GREMLIN_EXECUTE_ENDPOINT)
+                        .content(gremlinString)
+                        .contentType(TEXT_PLAIN_VALUE)
+                        .accept(APPLICATION_NDJSON))
+                .andReturn();
+
+        // Then
+        // Expect a server error response
+        assertThat(result.getResponse().getStatus()).isEqualTo(500);
+    }
+
+    @Test
+    void shouldExecuteValidCypherQuery() throws Exception {
+        String cypherString = "MATCH (p:person) WHERE ID(p) = '" + MARKO.getId() + "' RETURN p";
+
+        // Create the expected output (a cypher query returns a very specific graphson format)
+        JSONObject expected = new JSONObject()
+            .put("@type", "g:List")
+            .put("@value", new JSONArray()
+                .put(new JSONObject()
+                    .put("@type", "g:Map")
+                    .put("@value", new JSONArray()
+                        .put("p")
+                        .put(new JSONObject()
+                            .put("@type", "g:Map")
+                            .put("@value", new JSONArray()
+                                .put(new JSONObject()
+                                    .put("@type", "g:T")
+                                    .put("@value", "id"))
+                                .put("1")
+                                .put(new JSONObject()
+                                    .put("@type", "g:T")
+                                    .put("@value", "label"))
+                                .put("person")
+                                .put("name")
+                                .put(new JSONObject()
+                                    .put("@type", "g:List")
+                                    .put("@value", new JSONArray()
+                                        .put("marko")))
+                                .put("age")
+                                .put(new JSONObject()
+                                    .put("@type", "g:List")
+                                    .put("@value", new JSONArray()
+                                        .put(new JSONObject()
+                                            .put("@type", "g:Int32")
+                                            .put("@value", 29)))))))));
+        // When
+        MvcResult result = mockMvc
+            .perform(MockMvcRequestBuilders
+                .post(CYPHER_EXECUTE_ENDPOINT)
+                .content(cypherString)
+                .contentType(TEXT_PLAIN_VALUE)
+                .accept(APPLICATION_NDJSON))
+            .andExpect(MockMvcResultMatchers.request().asyncStarted())
+            .andReturn();
+
+        // Kick of the async dispatch so the result is available
+        mockMvc.perform(MockMvcRequestBuilders.asyncDispatch(result));
+
+        // Then
+        // Ensure OK response
+        assertThat(result.getResponse().getStatus()).isEqualTo(200);
+
+        // Get and check response
+        assertThat(new JSONObject(result.getResponse().getContentAsString()))
+            .hasToString(expected.toString());
+    }
+
     @Test
     void shouldReturnExplainOfValidCypherQuery() throws Exception {
         // Given
         String cypherString = "MATCH (p:person) WHERE ID(p) = '" + MARKO.getId() + "' RETURN p";
 
-        List<String> expectedOperations = Arrays.asList(GetElements.class.getName());
+        List<String> expectedOperations = Arrays.asList(GetElements.class.getName(), Limit.class.getName());
 
         // When
         MvcResult result = mockMvc
@@ -188,7 +304,7 @@ void shouldReturnExplainOfCypherQueryWithExtensions() throws Exception {
     }
 
     @Test
-    void shouldRejectMalformedCypherQuery() throws Exception {
+    void shouldRejectMalformedCypherQueryFromExplain() throws Exception {
         // Given
         String cypherString = "MATCH (p:person) WHERE RETURN p";
 
@@ -205,5 +321,24 @@ void shouldRejectMalformedCypherQuery() throws Exception {
         assertThat(result.getResponse().getStatus()).isEqualTo(500);
     }
 
+    @Test
+    void shouldRejectMalformedCypherQueryFromExecute() throws Exception {
+        // Given
+        String cypherString = "MATCH (p:person) WHERE RETURN p";
+
+        // When
+        MvcResult result = mockMvc
+                .perform(MockMvcRequestBuilders
+                        .post(CYPHER_EXECUTE_ENDPOINT)
+                        .content(cypherString)
+                        .contentType(TEXT_PLAIN_VALUE)
+                        .accept(APPLICATION_NDJSON))
+                .andReturn();
+
+        // Then
+        // Expect a server error response
+        assertThat(result.getResponse().getStatus()).isEqualTo(500);
+    }
+
 
 }
diff --git a/rest-api/spring-rest/src/test/java/uk/gov/gchq/gaffer/rest/integration/handler/GremlinWebSocketIT.java b/rest-api/spring-rest/src/test/java/uk/gov/gchq/gaffer/rest/integration/handler/GremlinWebSocketIT.java
index c3f72fff2f6..bae3b653253 100644
--- a/rest-api/spring-rest/src/test/java/uk/gov/gchq/gaffer/rest/integration/handler/GremlinWebSocketIT.java
+++ b/rest-api/spring-rest/src/test/java/uk/gov/gchq/gaffer/rest/integration/handler/GremlinWebSocketIT.java
@@ -80,6 +80,12 @@ public GraphTraversalSource g() {
         public AbstractUserFactory userFactory() {
             return new UnknownUserFactory();
         }
+
+        @Bean
+        @Profile("test")
+        public Long timeout() {
+            return 30000L;
+        }
     }
 
     @LocalServerPort
diff --git a/store-implementation/accumulo-store/src/main/java/uk/gov/gchq/gaffer/accumulostore/AccumuloProperties.java b/store-implementation/accumulo-store/src/main/java/uk/gov/gchq/gaffer/accumulostore/AccumuloProperties.java
index 474eb9482bb..baf239784dc 100644
--- a/store-implementation/accumulo-store/src/main/java/uk/gov/gchq/gaffer/accumulostore/AccumuloProperties.java
+++ b/store-implementation/accumulo-store/src/main/java/uk/gov/gchq/gaffer/accumulostore/AccumuloProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 Crown Copyright
+ * Copyright 2016-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,7 +52,7 @@ public class AccumuloProperties extends StoreProperties {
     public static final String TABLE_REPLICATION_FACTOR = "accumulo.file.replication";
     public static final String ENABLE_VALIDATOR_ITERATOR = "gaffer.store.accumulo.enable.validator.iterator";
     public static final String HDFS_SKIP_PERMISSIONS = "accumulostore.operation.hdfs.skip_permissions";
-
+    public static final String TABLE_CREATED_TIME = "table.custom.tableCreatedTime";
     // default values
     private static final String NUM_THREADS_FOR_BATCH_WRITER_DEFAULT = "10";
     private static final String MAX_ENTRIES_FOR_BATCH_SCANNER_DEFAULT = "50000";
diff --git a/store-implementation/accumulo-store/src/main/java/uk/gov/gchq/gaffer/accumulostore/AccumuloStore.java b/store-implementation/accumulo-store/src/main/java/uk/gov/gchq/gaffer/accumulostore/AccumuloStore.java
index 9487adfd14d..8e2ea59d92f 100644
--- a/store-implementation/accumulo-store/src/main/java/uk/gov/gchq/gaffer/accumulostore/AccumuloStore.java
+++ b/store-implementation/accumulo-store/src/main/java/uk/gov/gchq/gaffer/accumulostore/AccumuloStore.java
@@ -19,12 +19,14 @@
 import com.google.common.collect.Sets;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
+import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.client.ClientConfiguration;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.IteratorSetting;
 import org.apache.accumulo.core.client.MutationsRejectedException;
+import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat;
 import org.apache.accumulo.core.client.security.tokens.PasswordToken;
 import org.apache.accumulo.core.data.Key;
@@ -43,6 +45,7 @@
 import uk.gov.gchq.gaffer.accumulostore.key.exception.AccumuloElementConversionException;
 import uk.gov.gchq.gaffer.accumulostore.key.exception.IteratorSettingException;
 import uk.gov.gchq.gaffer.accumulostore.operation.handler.AddElementsHandler;
+import uk.gov.gchq.gaffer.accumulostore.operation.handler.DeleteAllDataHandler;
 import uk.gov.gchq.gaffer.accumulostore.operation.handler.DeleteElementsHandler;
 import uk.gov.gchq.gaffer.accumulostore.operation.handler.GenerateSplitPointsFromSampleHandler;
 import uk.gov.gchq.gaffer.accumulostore.operation.handler.GetAdjacentIdsHandler;
@@ -93,6 +96,7 @@
 import uk.gov.gchq.gaffer.store.StoreException;
 import uk.gov.gchq.gaffer.store.StoreProperties;
 import uk.gov.gchq.gaffer.store.StoreTrait;
+import uk.gov.gchq.gaffer.store.operation.DeleteAllData;
 import uk.gov.gchq.gaffer.store.operation.GetTraits;
 import uk.gov.gchq.gaffer.store.operation.handler.GetTraitsHandler;
 import uk.gov.gchq.gaffer.store.operation.handler.OperationHandler;
@@ -166,7 +170,28 @@ public void initialise(final String graphId, final Schema schema, final StorePro
         preInitialise(graphId, schema, properties);
         TableUtils.ensureTableExists(this);
     }
+    /**
+     * Retrieves Accumulo Table created time property.
+     * @return Accumulo Table created time string.
+     */
+    @Override
+    public String getCreatedTime() {
 
+        String tableName = TableUtils.getTableName(getProperties(), this.getGraphId());
+        Iterable<Entry<String, String>> properties;
+        try {
+            properties = TableUtils.getConnector(getProperties()).tableOperations().getProperties(tableName);
+            for (final Entry<String, String>  entry : properties) {
+                LOGGER.debug("Comparing Accumulo Table property: {}", entry.getKey());
+                if (entry.getKey().equals(AccumuloProperties.TABLE_CREATED_TIME)) {
+                    return entry.getValue();
+                }
+            }
+        } catch (final StoreException | AccumuloException | TableNotFoundException e) {
+            throw new GafferRuntimeException("Error getting timestamp.", e);
+        }
+        throw new GafferRuntimeException("Timestamp not found on table");
+    }
     /**
      * Performs general initialisation without creating the table.
      *
@@ -422,6 +447,11 @@ protected OperationHandler<? extends DeleteElements> getDeleteElementsHandler()
         return new DeleteElementsHandler();
     }
 
+    @Override
+    protected OperationHandler<DeleteAllData> getDeleteAllDataHandler() {
+        return new DeleteAllDataHandler();
+    }
+
     /**
      * Method to add {@link Element}s into Accumulo.
      *
diff --git a/store-implementation/accumulo-store/src/main/java/uk/gov/gchq/gaffer/accumulostore/utils/TableUtils.java b/store-implementation/accumulo-store/src/main/java/uk/gov/gchq/gaffer/accumulostore/utils/TableUtils.java
index 2c931ccc64b..8e1801e0ff5 100644
--- a/store-implementation/accumulo-store/src/main/java/uk/gov/gchq/gaffer/accumulostore/utils/TableUtils.java
+++ b/store-implementation/accumulo-store/src/main/java/uk/gov/gchq/gaffer/accumulostore/utils/TableUtils.java
@@ -47,6 +47,7 @@
 import uk.gov.gchq.gaffer.store.StoreException;
 import uk.gov.gchq.koryphe.ValidationResult;
 
+import java.time.LocalDateTime;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -139,6 +140,10 @@ public static synchronized void createTable(final AccumuloStore store)
             connector.tableOperations().setProperty(tableName, Property.TABLE_BLOOM_KEY_FUNCTOR.getKey(),
                     store.getKeyPackage().getKeyFunctor().getClass().getName());
 
+            //  Set table creation timestamp
+            LOGGER.info("Storing creation timestamp for table {}", tableName);
+            connector.tableOperations().setProperty(tableName, AccumuloProperties.TABLE_CREATED_TIME, LocalDateTime.now().toString());
+
             // Remove versioning iterator from table for all scopes
             LOGGER.info("Removing versioning iterator from table {}", tableName);
             final EnumSet<IteratorScope> iteratorScopes = EnumSet.allOf(IteratorScope.class);
diff --git a/store-implementation/accumulo-store/src/test/java/uk/gov/gchq/gaffer/accumulostore/AccumuloStoreTest.java b/store-implementation/accumulo-store/src/test/java/uk/gov/gchq/gaffer/accumulostore/AccumuloStoreTest.java
index 4b8d3c19a54..de77d4d34af 100644
--- a/store-implementation/accumulo-store/src/test/java/uk/gov/gchq/gaffer/accumulostore/AccumuloStoreTest.java
+++ b/store-implementation/accumulo-store/src/test/java/uk/gov/gchq/gaffer/accumulostore/AccumuloStoreTest.java
@@ -89,6 +89,7 @@
 import uk.gov.gchq.koryphe.impl.binaryoperator.Sum;
 import uk.gov.gchq.koryphe.impl.predicate.IsMoreThan;
 
+import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -580,4 +581,45 @@ void shouldDoNothingWhenCannotClose() throws Exception {
         }
      }
 
+     @Test
+     void shouldStoreTableCreatedTimeProperty() throws Exception {
+         // Given
+         final AccumuloProperties properties = PROPERTIES.clone();
+         String graphId = "graphId";
+
+         final AccumuloStore store = new MiniAccumuloStore();
+         // When
+
+         store.initialise(graphId, SCHEMA, properties);
+         LocalDateTime dateTime = LocalDateTime.now();
+         LocalDateTime storeDateTime = LocalDateTime.parse(store.getCreatedTime());
+         // Then
+         assertThat(storeDateTime).isBeforeOrEqualTo(dateTime);
+     }
+     @Test
+     void shouldThrowGafferRuntimeExceptionForGetCreatedTimeIfTableNotFound() throws Exception {
+        // Given
+        final AccumuloStore store = new MiniAccumuloStore();
+        store.initialise("graphId", SCHEMA, PROPERTIES);
+
+        // When
+        store.getConnection().tableOperations().delete("graphId");
+
+        // Then
+        assertThatExceptionOfType(GafferRuntimeException.class).isThrownBy(() -> store.getCreatedTime()).withMessage("Error getting timestamp.");
+     }
+
+     @Test
+     void shouldThrowGafferRuntimeExceptionIfTableCreatedTimePropertyNotFound() throws Exception {
+        // Given
+        final AccumuloStore store = new MiniAccumuloStore();
+        store.initialise("graphId", SCHEMA, PROPERTIES);
+
+        // When
+        store.getConnection().tableOperations().removeProperty("graphId", AccumuloProperties.TABLE_CREATED_TIME);
+
+        // Then
+        assertThatExceptionOfType(GafferRuntimeException.class).isThrownBy(() -> store.getCreatedTime()).withMessage("Timestamp not found on table");
+
+     }
 }
diff --git a/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/FederatedAccess.java b/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/FederatedAccess.java
index c45f5f8a06a..fc9d678f349 100644
--- a/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/FederatedAccess.java
+++ b/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/FederatedAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 Crown Copyright
+ * Copyright 2017-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -71,7 +71,9 @@
  * <tr><td> n/a     </td><td> {@code empty} </td><td> F
  * </td><td> F         </td></tr>
  * </table>
+ * @deprecated Will be replaced by a GraphAccess class in 2.4.0.
  */
+@Deprecated
 @JsonDeserialize(builder = FederatedAccess.Builder.class)
 @JsonPropertyOrder(value = {"class", "owningUserId"}, alphabetic = true)
 public class FederatedAccess implements AccessControlledResource {
diff --git a/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/FederatedGraphStorage.java b/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/FederatedGraphStorage.java
index 56540c45030..e7c54e8defe 100644
--- a/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/FederatedGraphStorage.java
+++ b/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/FederatedGraphStorage.java
@@ -49,6 +49,10 @@
 import static java.util.Objects.nonNull;
 import static uk.gov.gchq.gaffer.accumulostore.utils.TableUtils.renameTable;
 
+/**
+ * @deprecated Will be removed in 2.4.0.
+ */
+@Deprecated
 public class FederatedGraphStorage {
     public static final String ERROR_ADDING_GRAPH_TO_CACHE = "Error adding graph, GraphId is known within the cache, but %s is different. GraphId: %s";
     public static final String USER_IS_ATTEMPTING_TO_OVERWRITE = "User is attempting to overwrite a graph within FederatedStore. GraphId: %s";
diff --git a/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/FederatedStore.java b/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/FederatedStore.java
index c92ae290669..6b8d4780c8b 100644
--- a/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/FederatedStore.java
+++ b/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/FederatedStore.java
@@ -81,6 +81,7 @@
 import uk.gov.gchq.gaffer.store.StoreProperties;
 import uk.gov.gchq.gaffer.store.StoreTrait;
 import uk.gov.gchq.gaffer.store.library.GraphLibrary;
+import uk.gov.gchq.gaffer.store.operation.DeleteAllData;
 import uk.gov.gchq.gaffer.store.operation.GetSchema;
 import uk.gov.gchq.gaffer.store.operation.GetTraits;
 import uk.gov.gchq.gaffer.store.operation.OperationChainValidator;
@@ -553,12 +554,16 @@ protected OperationHandler<? extends DeleteElements> getDeleteElementsHandler()
         return new FederatedNoOutputHandler<>();
     }
 
+    @Override
+    protected OperationHandler<DeleteAllData> getDeleteAllDataHandler() {
+        return new FederatedNoOutputHandler<>();
+    }
+
     @Override
     protected OutputOperationHandler<? extends GetAdjacentIds, Iterable<? extends EntityId>> getAdjacentIdsHandler() {
         return new FederatedOutputIterableHandler<>();
     }
 
-    @SuppressWarnings({"rawtypes", "unchecked"})
     @Override
     protected OperationHandler<? extends AddElements> getAddElementsHandler() {
         return new FederatedNoOutputHandler<>();
diff --git a/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/FederatedStoreCache.java b/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/FederatedStoreCache.java
index 4353175c0cd..a5398d5bb8f 100644
--- a/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/FederatedStoreCache.java
+++ b/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/FederatedStoreCache.java
@@ -26,9 +26,14 @@
 import uk.gov.gchq.gaffer.jsonserialisation.JSONSerialiser;
 
 /**
- * Wrapper around {@link FederatedStoreCacheTransient} to provide an interface for
+ * Wrapper around {@link FederatedStoreCacheTransient} to provide an interface
+ * for
  * handling {@link Graph}s within a {@link FederatedStore}.
+ *
+ * @deprecated Federated store will use the default cache implementation going
+ *             forward.
  */
+@Deprecated
 public final class FederatedStoreCache {
     private final FederatedStoreCacheTransient cacheTransient;
 
diff --git a/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/FederatedStoreCacheTransient.java b/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/FederatedStoreCacheTransient.java
index 4879fa3c066..ba2e6425ec8 100644
--- a/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/FederatedStoreCacheTransient.java
+++ b/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/FederatedStoreCacheTransient.java
@@ -25,7 +25,11 @@
 /**
  * Implementation of {@link Cache} for handling
  * {@link Graph}s within a {@link FederatedStore}.
+ *
+ * @deprecated Federated store will use the default cache implementation going
+ *             forward.
  */
+@Deprecated
 public class FederatedStoreCacheTransient extends Cache<String, Pair<GraphSerialisable, byte[]>> {
     public static final String ERROR_ADDING_GRAPH_TO_CACHE_GRAPH_ID_S = "Error adding graph to cache. graphId: %s";
     private static final String CACHE_SERVICE_NAME_PREFIX = "federatedStoreGraphs";
diff --git a/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/access/predicate/FederatedGraphAccessPredicate.java b/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/access/predicate/FederatedGraphAccessPredicate.java
index 0e94b248b10..46f014558a9 100644
--- a/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/access/predicate/FederatedGraphAccessPredicate.java
+++ b/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/access/predicate/FederatedGraphAccessPredicate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 Crown Copyright
+ * Copyright 2020-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,11 @@
 import static org.apache.commons.lang3.StringUtils.isNotEmpty;
 import static uk.gov.gchq.gaffer.federatedstore.FederatedStoreConstants.FEDERATED_STORE_SYSTEM_USER;
 
+/**
+ * @deprecated Marked for removal in 2.4.0 please use standard AccessPredicates
+ *             going forward.
+ */
+@Deprecated
 public abstract class FederatedGraphAccessPredicate extends AccessPredicate {
 
     public FederatedGraphAccessPredicate(final Predicate<User> userPredicate) {
diff --git a/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/access/predicate/FederatedGraphReadAccessPredicate.java b/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/access/predicate/FederatedGraphReadAccessPredicate.java
index bf4848026d9..4ce3014779d 100644
--- a/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/access/predicate/FederatedGraphReadAccessPredicate.java
+++ b/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/access/predicate/FederatedGraphReadAccessPredicate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Crown Copyright
+ * Copyright 2020-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,6 +28,11 @@
 
 import static java.util.Collections.emptyList;
 
+/**
+ * @deprecated Marked for removal in 2.4.0 please use standard AccessPredicates
+ *             going forward.
+ */
+@Deprecated
 public class FederatedGraphReadAccessPredicate extends FederatedGraphAccessPredicate {
 
     public FederatedGraphReadAccessPredicate(final String creatingUserId, final Set<String> auths, final boolean isPublic) {
diff --git a/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/access/predicate/FederatedGraphWriteAccessPredicate.java b/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/access/predicate/FederatedGraphWriteAccessPredicate.java
index 27073f28dff..40c85ac97a6 100644
--- a/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/access/predicate/FederatedGraphWriteAccessPredicate.java
+++ b/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/access/predicate/FederatedGraphWriteAccessPredicate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Crown Copyright
+ * Copyright 2020-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package uk.gov.gchq.gaffer.federatedstore.access.predicate;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -20,6 +21,11 @@
 
 import uk.gov.gchq.gaffer.federatedstore.access.predicate.user.FederatedGraphWriteUserPredicate;
 
+/**
+ * @deprecated Marked for removal in 2.4.0 please use standard AccessPredicates
+ *             going forward.
+ */
+@Deprecated
 public class FederatedGraphWriteAccessPredicate extends FederatedGraphAccessPredicate {
 
     @JsonCreator
diff --git a/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/access/predicate/user/FederatedGraphReadUserPredicate.java b/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/access/predicate/user/FederatedGraphReadUserPredicate.java
index 3a6837a3d38..97fa18289f1 100644
--- a/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/access/predicate/user/FederatedGraphReadUserPredicate.java
+++ b/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/access/predicate/user/FederatedGraphReadUserPredicate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 Crown Copyright
+ * Copyright 2020-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package uk.gov.gchq.gaffer.federatedstore.access.predicate.user;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -27,6 +28,11 @@
 
 import static java.util.Objects.isNull;
 
+/**
+ * @deprecated Marked for removal in 2.4.0 please use standard
+ *             DefaultUserPredicate going forward.
+ */
+@Deprecated
 public class FederatedGraphReadUserPredicate extends DefaultUserPredicate {
 
     private final boolean isPublic;
diff --git a/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/access/predicate/user/FederatedGraphWriteUserPredicate.java b/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/access/predicate/user/FederatedGraphWriteUserPredicate.java
index 647b075a315..8dbd9e89d8e 100644
--- a/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/access/predicate/user/FederatedGraphWriteUserPredicate.java
+++ b/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/access/predicate/user/FederatedGraphWriteUserPredicate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Crown Copyright
+ * Copyright 2020-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package uk.gov.gchq.gaffer.federatedstore.access.predicate.user;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -26,6 +27,11 @@
 
 import static java.util.Collections.emptyList;
 
+/**
+ * @deprecated Marked for removal in 2.4.0 please use standard
+ *             DefaultUserPredicate going forward.
+ */
+@Deprecated
 public class FederatedGraphWriteUserPredicate extends DefaultUserPredicate {
 
     @JsonCreator
diff --git a/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/operation/AddGraphWithHooks.java b/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/operation/AddGraphWithHooks.java
index a497a11136b..bd6da2fa8b0 100644
--- a/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/operation/AddGraphWithHooks.java
+++ b/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/operation/AddGraphWithHooks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2023 Crown Copyright
+ * Copyright 2018-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,11 @@
 import uk.gov.gchq.koryphe.Since;
 import uk.gov.gchq.koryphe.Summary;
 
+/**
+ * @deprecated Will be removed in 2.4.0, functionality will be merged into the
+ *             AddGraph operation.
+ */
+@Deprecated
 @JsonPropertyOrder(
         value = {"class", "graphId"},
         alphabetic = true
diff --git a/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/operation/FederatedOperation.java b/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/operation/FederatedOperation.java
index a64d4069f22..b208cf7f994 100644
--- a/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/operation/FederatedOperation.java
+++ b/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/operation/FederatedOperation.java
@@ -57,11 +57,15 @@
 import static uk.gov.gchq.gaffer.federatedstore.util.FederatedStoreUtil.getCleanStrings;
 
 /**
- * This operation federates a payload operation across a given set of graphs and merges the results with a given function.
+ * This operation federates a payload operation across a given set of graphs and
+ * merges the results with a given function.
  *
  * @param <INPUT>  Input type of the payload operation
  * @param <OUTPUT> Output type of the merge function
+ * @deprecated Concept of a FederatedOperation class will not exist from 2.4.0,
+ *             all federation specifics are handled via operation options.
  */
+@Deprecated
 @JsonPropertyOrder(value = {"class", "operation", "mergeFunction", "graphIds", "skipFailedFederatedExecution"}, alphabetic = true)
 @Since("2.0.0")
 @Summary("Federates a payload operation across given graphs and merges the results with a given function.")
diff --git a/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/operation/IFederatedOperation.java b/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/operation/IFederatedOperation.java
index 72b382b07e8..f337fa1fbfb 100644
--- a/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/operation/IFederatedOperation.java
+++ b/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/operation/IFederatedOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 Crown Copyright
+ * Copyright 2021-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,11 @@
 
 /**
  * Interface for Operations that uses a selection of graphs to be performed.
+ *
+ * @deprecated Concept of a FederatedOperation class will not exist from 2.4.0,
+ *             all federation specifics are handled via operation options.
  */
+@Deprecated
 @Since("2.0.0")
 public interface IFederatedOperation extends Operation {
 
diff --git a/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/operation/IFederationOperation.java b/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/operation/IFederationOperation.java
index ea9ada7c1fb..8e09249bd99 100644
--- a/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/operation/IFederationOperation.java
+++ b/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/operation/IFederationOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 Crown Copyright
+ * Copyright 2021-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,9 +24,15 @@
 import uk.gov.gchq.koryphe.Since;
 
 /**
- * {@link IFederationOperation} interface is for special operations used to configure/manipulate/control federation.
- * It has no intended function outside of federation and should only be handled by the {@link uk.gov.gchq.gaffer.federatedstore.FederatedStore}.
+ * {@link IFederationOperation} interface is for special operations used to
+ * configure/manipulate/control federation.
+ * It has no intended function outside of federation and should only be handled
+ * by the {@link uk.gov.gchq.gaffer.federatedstore.FederatedStore}.
+ *
+ * @deprecated Concept of a FederatedOperation class will not exist from 2.4.0,
+ *             all federation specifics are handled via operation options.
  */
+@Deprecated
 @Since("2.0.0")
 public interface IFederationOperation extends Operation {
 
diff --git a/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/operation/RemoveGraphAndDeleteAllData.java b/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/operation/RemoveGraphAndDeleteAllData.java
index 8fa8eff635b..efe3bfd36ba 100644
--- a/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/operation/RemoveGraphAndDeleteAllData.java
+++ b/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/operation/RemoveGraphAndDeleteAllData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2022 Crown Copyright
+ * Copyright 2017-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,11 @@
 import uk.gov.gchq.koryphe.Since;
 import uk.gov.gchq.koryphe.Summary;
 
+/**
+ * @deprecated Will be removed in 2.4.0, functionality will be merged into the
+ *             RemoveGraph operation.
+ */
+@Deprecated
 @JsonPropertyOrder(value = {"class", "graphId"}, alphabetic = true)
 @Since("2.0.0")
 @Summary("Used to tell a graph to delete all data, before being removed.")
diff --git a/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/util/ContextSpecificMergeFunction.java b/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/util/ContextSpecificMergeFunction.java
index 842235591fd..8065c52de5c 100644
--- a/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/util/ContextSpecificMergeFunction.java
+++ b/store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/util/ContextSpecificMergeFunction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Crown Copyright
+ * Copyright 2022-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,9 @@
  * @param <U> – the type of the second argument to the function
  * @param <R> – the type of the result of the function
  * @see BiFunction
+ * @deprecated Merging will be overhauled in 2.4.0.
  */
+@Deprecated
 public interface ContextSpecificMergeFunction<T, U, R> extends BiFunction<T, U, R> {
     ContextSpecificMergeFunction<T, U, R> createFunctionWithContext(final HashMap<String, Object> context) throws GafferCheckedException;
 
diff --git a/store-implementation/federated-store/src/test/java/uk/gov/gchq/gaffer/federatedstore/FederatedStoreTest.java b/store-implementation/federated-store/src/test/java/uk/gov/gchq/gaffer/federatedstore/FederatedStoreTest.java
index ad12c9de152..5964a611a28 100644
--- a/store-implementation/federated-store/src/test/java/uk/gov/gchq/gaffer/federatedstore/FederatedStoreTest.java
+++ b/store-implementation/federated-store/src/test/java/uk/gov/gchq/gaffer/federatedstore/FederatedStoreTest.java
@@ -748,7 +748,6 @@ public void shouldReturnSpecificGraphsFromCSVString() throws Exception {
 
         // When
         final Collection<GraphSerialisable> returnedGraphs = store.getGraphs(blankUser, getCleanStrings("mockGraphId1,mockGraphId2,mockGraphId4"), new GetAllGraphIds());
-
         // Then
         assertThat(returnedGraphs)
                 .hasSize(3)
diff --git a/store-implementation/federated-store/src/test/java/uk/gov/gchq/gaffer/federatedstore/operation/handler/impl/FederatedGetTraitsHandlerTest.java b/store-implementation/federated-store/src/test/java/uk/gov/gchq/gaffer/federatedstore/operation/handler/impl/FederatedGetTraitsHandlerTest.java
index 11792df3283..b06a9b35a70 100644
--- a/store-implementation/federated-store/src/test/java/uk/gov/gchq/gaffer/federatedstore/operation/handler/impl/FederatedGetTraitsHandlerTest.java
+++ b/store-implementation/federated-store/src/test/java/uk/gov/gchq/gaffer/federatedstore/operation/handler/impl/FederatedGetTraitsHandlerTest.java
@@ -40,6 +40,7 @@
 import uk.gov.gchq.gaffer.store.StoreProperties;
 import uk.gov.gchq.gaffer.store.StoreTrait;
 import uk.gov.gchq.gaffer.store.library.HashMapGraphLibrary;
+import uk.gov.gchq.gaffer.store.operation.DeleteAllData;
 import uk.gov.gchq.gaffer.store.operation.GetTraits;
 import uk.gov.gchq.gaffer.store.operation.handler.GetTraitsHandler;
 import uk.gov.gchq.gaffer.store.operation.handler.OperationHandler;
@@ -288,7 +289,12 @@ protected OperationHandler<? extends AddElements> getAddElementsHandler() {
 
         @Override
         protected OperationHandler<? extends DeleteElements> getDeleteElementsHandler() {
-                return null;
+            return null;
+        }
+
+        @Override
+        protected OperationHandler<DeleteAllData> getDeleteAllDataHandler() {
+            return null;
         }
 
         @Override
diff --git a/store-implementation/map-store/src/main/java/uk/gov/gchq/gaffer/mapstore/MapStore.java b/store-implementation/map-store/src/main/java/uk/gov/gchq/gaffer/mapstore/MapStore.java
index 2ca8dda95b2..528632ce895 100644
--- a/store-implementation/map-store/src/main/java/uk/gov/gchq/gaffer/mapstore/MapStore.java
+++ b/store-implementation/map-store/src/main/java/uk/gov/gchq/gaffer/mapstore/MapStore.java
@@ -24,6 +24,7 @@
 import uk.gov.gchq.gaffer.data.element.id.EntityId;
 import uk.gov.gchq.gaffer.mapstore.impl.AddElementsHandler;
 import uk.gov.gchq.gaffer.mapstore.impl.CountAllElementsDefaultViewHandler;
+import uk.gov.gchq.gaffer.mapstore.impl.DeleteAllDataHandler;
 import uk.gov.gchq.gaffer.mapstore.impl.DeleteElementsHandler;
 import uk.gov.gchq.gaffer.mapstore.impl.GetAdjacentIdsHandler;
 import uk.gov.gchq.gaffer.mapstore.impl.GetAllElementsHandler;
@@ -45,6 +46,7 @@
 import uk.gov.gchq.gaffer.store.StoreException;
 import uk.gov.gchq.gaffer.store.StoreProperties;
 import uk.gov.gchq.gaffer.store.StoreTrait;
+import uk.gov.gchq.gaffer.store.operation.DeleteAllData;
 import uk.gov.gchq.gaffer.store.operation.GetTraits;
 import uk.gov.gchq.gaffer.store.operation.handler.GetTraitsHandler;
 import uk.gov.gchq.gaffer.store.operation.handler.OperationHandler;
@@ -178,6 +180,11 @@ protected OperationHandler<? extends DeleteElements> getDeleteElementsHandler()
         return new DeleteElementsHandler();
     }
 
+    @Override
+    protected OperationHandler<DeleteAllData> getDeleteAllDataHandler() {
+        return new DeleteAllDataHandler();
+    }
+
     @Override
     protected OutputOperationHandler<GetTraits, Set<StoreTrait>> getGetTraitsHandler() {
         return new GetTraitsHandler(TRAITS);
diff --git a/store-implementation/map-store/src/main/java/uk/gov/gchq/gaffer/mapstore/SingleUseMapStoreWithoutVisibilitySupport.java b/store-implementation/map-store/src/main/java/uk/gov/gchq/gaffer/mapstore/SingleUseMapStoreWithoutVisibilitySupport.java
index c791d457297..cfa78e29746 100644
--- a/store-implementation/map-store/src/main/java/uk/gov/gchq/gaffer/mapstore/SingleUseMapStoreWithoutVisibilitySupport.java
+++ b/store-implementation/map-store/src/main/java/uk/gov/gchq/gaffer/mapstore/SingleUseMapStoreWithoutVisibilitySupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 Crown Copyright
+ * Copyright 2020-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,11 +26,12 @@
 
 public class SingleUseMapStoreWithoutVisibilitySupport extends SingleUseMapStore {
 
-    private static final Set<StoreTrait> TRAITS = new HashSet<StoreTrait>(MapStore.TRAITS) {
-        {
-            remove(StoreTrait.VISIBILITY);
-        }
-    };
+
+    private static final Set<StoreTrait> TRAITS = new HashSet<>(MapStore.TRAITS);
+
+    static {
+        TRAITS.remove(StoreTrait.VISIBILITY);
+    }
 
     @Override
     public Set<StoreTrait> getTraits() {
diff --git a/store-implementation/map-store/src/main/java/uk/gov/gchq/gaffer/mapstore/impl/AddElementsHandler.java b/store-implementation/map-store/src/main/java/uk/gov/gchq/gaffer/mapstore/impl/AddElementsHandler.java
index 6d40dc7c1fe..7dace5b86cd 100644
--- a/store-implementation/map-store/src/main/java/uk/gov/gchq/gaffer/mapstore/impl/AddElementsHandler.java
+++ b/store-implementation/map-store/src/main/java/uk/gov/gchq/gaffer/mapstore/impl/AddElementsHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2022 Crown Copyright
+ * Copyright 2017-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 import uk.gov.gchq.gaffer.data.element.Element;
 import uk.gov.gchq.gaffer.data.element.Entity;
 import uk.gov.gchq.gaffer.data.element.GroupedProperties;
+import uk.gov.gchq.gaffer.data.element.id.EdgeId.MatchedVertex;
 import uk.gov.gchq.gaffer.mapstore.MapStore;
 import uk.gov.gchq.gaffer.operation.OperationException;
 import uk.gov.gchq.gaffer.operation.data.EdgeSeed;
@@ -149,11 +150,12 @@ private void updateElementIndex(final Element element, final MapImpl mapImpl) {
             mapImpl.addIndex(entitySeed, element);
         } else {
             final Edge edge = (Edge) element;
-            edge.setIdentifiers(edge.getSource(), edge.getDestination(), edge.isDirected(), EdgeSeed.MatchedVertex.SOURCE);
+            final Edge sourceMatchedEdge = new Edge(edge.getGroup(), edge.getSource(), edge.getDestination(), edge.isDirected(), MatchedVertex.SOURCE, edge.getProperties());
+
             final EntitySeed sourceEntitySeed = new EntitySeed(edge.getSource());
-            mapImpl.addIndex(sourceEntitySeed, edge);
+            mapImpl.addIndex(sourceEntitySeed, sourceMatchedEdge);
 
-            final Edge destMatchedEdge = new Edge(edge.getGroup(), edge.getSource(), edge.getDestination(), edge.isDirected(), EdgeSeed.MatchedVertex.DESTINATION, edge.getProperties());
+            final Edge destMatchedEdge = new Edge(edge.getGroup(), edge.getSource(), edge.getDestination(), edge.isDirected(), MatchedVertex.DESTINATION, edge.getProperties());
             final EntitySeed destinationEntitySeed = new EntitySeed(edge.getDestination());
             mapImpl.addIndex(destinationEntitySeed, destMatchedEdge);
 
diff --git a/store-implementation/map-store/src/main/java/uk/gov/gchq/gaffer/mapstore/impl/DeleteAllDataHandler.java b/store-implementation/map-store/src/main/java/uk/gov/gchq/gaffer/mapstore/impl/DeleteAllDataHandler.java
new file mode 100644
index 00000000000..9fa51b6c60f
--- /dev/null
+++ b/store-implementation/map-store/src/main/java/uk/gov/gchq/gaffer/mapstore/impl/DeleteAllDataHandler.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.mapstore.impl;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import uk.gov.gchq.gaffer.mapstore.MapStore;
+import uk.gov.gchq.gaffer.operation.OperationException;
+import uk.gov.gchq.gaffer.store.Context;
+import uk.gov.gchq.gaffer.store.Store;
+import uk.gov.gchq.gaffer.store.operation.DeleteAllData;
+import uk.gov.gchq.gaffer.store.operation.handler.OperationHandler;
+
+public class DeleteAllDataHandler implements OperationHandler<DeleteAllData> {
+    private static final Logger LOGGER = LoggerFactory.getLogger(DeleteAllDataHandler.class);
+
+    @Override
+    public Object doOperation(final DeleteAllData operation, final Context context, final Store store) throws OperationException {
+        LOGGER.info("Removing all data from graph: {}", store.getGraphId());
+        removeAllData((MapStore) store);
+        return null;
+    }
+
+    private void removeAllData(final MapStore mapStore) {
+        final MapImpl mapImpl = mapStore.getMapImpl();
+        mapImpl.clear();
+    }
+}
diff --git a/store-implementation/map-store/src/main/java/uk/gov/gchq/gaffer/mapstore/impl/GetAdjacentIdsHandler.java b/store-implementation/map-store/src/main/java/uk/gov/gchq/gaffer/mapstore/impl/GetAdjacentIdsHandler.java
index 4e11185b665..21301435ab8 100644
--- a/store-implementation/map-store/src/main/java/uk/gov/gchq/gaffer/mapstore/impl/GetAdjacentIdsHandler.java
+++ b/store-implementation/map-store/src/main/java/uk/gov/gchq/gaffer/mapstore/impl/GetAdjacentIdsHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 Crown Copyright
+ * Copyright 2017-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package uk.gov.gchq.gaffer.mapstore.impl;
 
 import uk.gov.gchq.gaffer.commonutil.iterable.EmptyIterable;
@@ -52,8 +53,7 @@ public Iterable<? extends EntityId> doOperation(final GetAdjacentIds operation,
 
     private Iterable<EntityId> doOperation(final GetAdjacentIds operation,
                                            final Context context,
-                                           final MapStore mapStore)
-            throws OperationException {
+                                           final MapStore mapStore) {
         if (isNull(operation.getInput()) || !operation.getInput().iterator().hasNext()) {
             return new EmptyIterable<>();
         }
diff --git a/store-implementation/map-store/src/main/java/uk/gov/gchq/gaffer/mapstore/impl/GetElementsUtil.java b/store-implementation/map-store/src/main/java/uk/gov/gchq/gaffer/mapstore/impl/GetElementsUtil.java
index ebb58528e3f..ef1ef78098f 100644
--- a/store-implementation/map-store/src/main/java/uk/gov/gchq/gaffer/mapstore/impl/GetElementsUtil.java
+++ b/store-implementation/map-store/src/main/java/uk/gov/gchq/gaffer/mapstore/impl/GetElementsUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 Crown Copyright
+ * Copyright 2017-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -89,34 +89,28 @@ public static Set<Element> getRelevantElements(final MapImpl mapImpl,
                         && ((Edge) e).isDirected()
                         && (EdgeId.MatchedVertex.DESTINATION == ((Edge) e).getMatchedVertex()));
             }
+
             // Remove Edges if searching with EntityId and View has no Edges
             if (view.hasEntities() && !view.hasEdges()) {
-                isFiltered = isFiltered.or(e -> e instanceof Edge);
+                isFiltered = isFiltered.or(Edge.class::isInstance);
             }
         } else {
-            relevantElements = new HashSet<>();
-
             final EdgeId edgeId = (EdgeId) elementId;
 
-            if (DirectedType.isEither(edgeId.getDirectedType())) {
-                relevantElements.addAll(mapImpl.lookup(new EdgeSeed(edgeId.getSource(), edgeId.getDestination(), false)));
-                relevantElements.addAll(mapImpl.lookup(new EdgeSeed(edgeId.getSource(), edgeId.getDestination(), true)));
-            } else {
-                relevantElements.addAll(mapImpl.lookup(new EdgeSeed(edgeId.getSource(), edgeId.getDestination(), edgeId.getDirectedType())));
-            }
+            relevantElements = getRelevantElements(mapImpl, edgeId);
 
             mapImpl.lookup(new EntitySeed(edgeId.getSource()))
                     .stream()
-                    .filter(e -> e instanceof Entity)
+                    .filter(Entity.class::isInstance)
                     .forEach(relevantElements::add);
             mapImpl.lookup(new EntitySeed(edgeId.getDestination()))
                     .stream()
-                    .filter(e -> e instanceof Entity)
+                    .filter(Entity.class::isInstance)
                     .forEach(relevantElements::add);
 
             // Remove Entities if searching with EdgeId and View has no Entities
             if (view.hasEdges() && !view.hasEntities()) {
-                isFiltered = isFiltered.or(e -> e instanceof Entity);
+                isFiltered = isFiltered.or(Entity.class::isInstance);
             }
         }
 
@@ -131,6 +125,19 @@ public static Set<Element> getRelevantElements(final MapImpl mapImpl,
         return relevantElements;
     }
 
+    private static Set<Element> getRelevantElements(final MapImpl mapImpl, final EdgeId edgeId) {
+        final Set<Element> relevantElements = new HashSet<>();
+
+        if (DirectedType.isEither(edgeId.getDirectedType())) {
+            relevantElements.addAll(mapImpl.lookup(new EdgeSeed(edgeId.getSource(), edgeId.getDestination(), false)));
+            relevantElements.addAll(mapImpl.lookup(new EdgeSeed(edgeId.getSource(), edgeId.getDestination(), true)));
+        } else {
+            relevantElements.addAll(mapImpl.lookup(new EdgeSeed(edgeId.getSource(), edgeId.getDestination(), edgeId.getDirectedType())));
+        }
+
+        return relevantElements;
+    }
+
     public static Stream<Element> applyVisibilityFilter(final Stream<Element> elements, final Schema schema,
                                                         final User user) {
         final Set<String> dataAuths = user.getDataAuths();
@@ -142,7 +149,7 @@ private static boolean isVisible(final Element e, final String visibilityPropert
                                      final Authorisations authorisations) {
         if (e.getProperty(visibilityProperty) != null) {
             final VisibilityEvaluator visibilityEvaluator = new VisibilityEvaluator(authorisations);
-            final ElementVisibility elementVisibility = new ElementVisibility((String) e.getProperty(visibilityProperty));
+            final ElementVisibility elementVisibility = new ElementVisibility(e.getProperty(visibilityProperty));
             try {
                 return visibilityEvaluator.evaluate(elementVisibility);
             } catch (final VisibilityParseException visibilityParseException) {
diff --git a/store-implementation/map-store/src/main/java/uk/gov/gchq/gaffer/mapstore/impl/MapImpl.java b/store-implementation/map-store/src/main/java/uk/gov/gchq/gaffer/mapstore/impl/MapImpl.java
index cf0bee07cbf..322bf8621d0 100644
--- a/store-implementation/map-store/src/main/java/uk/gov/gchq/gaffer/mapstore/impl/MapImpl.java
+++ b/store-implementation/map-store/src/main/java/uk/gov/gchq/gaffer/mapstore/impl/MapImpl.java
@@ -147,8 +147,8 @@ void deleteNonAggElement(final Element element) {
         nonAggElements.get(element.getGroup()).remove(element);
     }
 
-    Collection<Element> lookup(final EntityId entitId) {
-        Collection<Element> results = entityIdToElements.get(entitId);
+    Collection<Element> lookup(final EntityId entityId) {
+        Collection<Element> results = entityIdToElements.get(entityId);
         if (null == results) {
             results = Collections.emptySet();
         }
diff --git a/store-implementation/map-store/src/main/java/uk/gov/gchq/gaffer/mapstore/multimap/MapOfSets.java b/store-implementation/map-store/src/main/java/uk/gov/gchq/gaffer/mapstore/multimap/MapOfSets.java
index 7fd330d7990..28a4a089bcf 100644
--- a/store-implementation/map-store/src/main/java/uk/gov/gchq/gaffer/mapstore/multimap/MapOfSets.java
+++ b/store-implementation/map-store/src/main/java/uk/gov/gchq/gaffer/mapstore/multimap/MapOfSets.java
@@ -52,7 +52,7 @@ public void put(final K key, final Collection<V> value) {
         final Set<V> existingValue = multiMap.get(key);
         if (null == existingValue) {
             if (value instanceof Set) {
-                multiMap.put(key, ((Set) value));
+                multiMap.put(key, ((Set<V>) value));
             } else {
                 multiMap.put(key, Sets.newHashSet(value));
             }
diff --git a/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/MapStorePropertiesGraphSerialisableTest.java b/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/MapStorePropertiesGraphSerialisableTest.java
index 71df0cac0bc..2f9791cd81b 100644
--- a/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/MapStorePropertiesGraphSerialisableTest.java
+++ b/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/MapStorePropertiesGraphSerialisableTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 Crown Copyright
+ * Copyright 2017-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,16 +32,16 @@
 
 import java.util.Properties;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
-public class MapStorePropertiesGraphSerialisableTest {
+class MapStorePropertiesGraphSerialisableTest {
     private GraphConfig config;
     private Schema schema;
     private Properties properties;
     private GraphSerialisable expected;
 
     @BeforeEach
-    public void setUp() throws Exception {
+    public void setUp() {
         config = new GraphConfig.Builder()
                 .graphId("testGraphId")
                 .addHook(new NamedViewResolver("testGraphId"))
@@ -71,19 +71,19 @@ private GraphSerialisable getGraphSerialisable() {
     }
 
     @Test
-    public void shouldSerialiseAndDeserialise() throws Exception {
+    void shouldSerialiseAndDeserialise() throws Exception {
         final JavaSerialiser javaSerialiser = new JavaSerialiser();
         final byte[] serialise = javaSerialiser.serialise(expected);
         final GraphSerialisable result = (GraphSerialisable) javaSerialiser.deserialise(serialise);
-        assertEquals(expected, result);
+        assertThat(result).isEqualTo(expected);
     }
 
     @Test
-    public void shouldConsumeGraph() throws Exception {
+    void shouldConsumeGraph() {
         final MapStoreProperties mapStoreProperties = new MapStoreProperties();
         mapStoreProperties.setProperties(properties);
         final Graph graph = new Graph.Builder().addSchema(schema).addStoreProperties(mapStoreProperties).config(config).build();
         final GraphSerialisable result = new GraphSerialisable.Builder(graph).build();
-        assertEquals(expected, result);
+        assertThat(result).isEqualTo(expected);
     }
 }
diff --git a/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/MapStorePropertiesTest.java b/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/MapStorePropertiesTest.java
index f80c032b49a..50fbca31ddb 100644
--- a/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/MapStorePropertiesTest.java
+++ b/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/MapStorePropertiesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Crown Copyright
+ * Copyright 2021-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package uk.gov.gchq.gaffer.mapstore;
 
 import org.junit.jupiter.api.Test;
@@ -21,12 +22,12 @@
 import uk.gov.gchq.gaffer.store.StorePropertiesTest.TestCustomJsonModules1;
 import uk.gov.gchq.gaffer.store.StorePropertiesTest.TestCustomJsonModules2;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
-public class MapStorePropertiesTest {
+class MapStorePropertiesTest {
 
     @Test
-    public void shouldMergeJsonModules() {
+    void shouldMergeJsonModules() {
         // Given
         final MapStoreProperties props = new MapStoreProperties();
         props.setJsonSerialiserModules(TestCustomJsonModules1.class.getName() + "," + TestCustomJsonModules2.class.getName());
@@ -35,11 +36,12 @@ public void shouldMergeJsonModules() {
         final String modules = props.getJsonSerialiserModules();
 
         // Then
-        assertEquals(SketchesJsonModules.class.getName() + "," + TestCustomJsonModules1.class.getName() + "," + TestCustomJsonModules2.class.getName(), modules);
+        assertThat(modules)
+            .isEqualTo(SketchesJsonModules.class.getName() + "," + TestCustomJsonModules1.class.getName() + "," + TestCustomJsonModules2.class.getName());
     }
 
     @Test
-    public void shouldMergeJsonModulesAndDeduplicate() {
+    void shouldMergeJsonModulesAndDeduplicate() {
         // Given
         final MapStoreProperties props = new MapStoreProperties();
         props.setJsonSerialiserModules(TestCustomJsonModules1.class.getName() + "," + SketchesJsonModules.class.getName());
@@ -48,6 +50,6 @@ public void shouldMergeJsonModulesAndDeduplicate() {
         final String modules = props.getJsonSerialiserModules();
 
         // Then
-        assertEquals(SketchesJsonModules.class.getName() + "," + TestCustomJsonModules1.class.getName(), modules);
+        assertThat(modules).isEqualTo(SketchesJsonModules.class.getName() + "," + TestCustomJsonModules1.class.getName());
     }
 }
diff --git a/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/MapStoreTest.java b/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/MapStoreTest.java
index ac06c86fbba..380f9e448bd 100644
--- a/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/MapStoreTest.java
+++ b/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/MapStoreTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 Crown Copyright
+ * Copyright 2017-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package uk.gov.gchq.gaffer.mapstore;
 
 import org.junit.jupiter.api.Test;
@@ -26,13 +27,12 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
-public class MapStoreTest {
+class MapStoreTest {
 
     @Test
-    public void testTraits() throws StoreException {
+    void testTraits() throws StoreException {
         final MapStore mapStore = new MapStore();
         mapStore.initialise("graphId", new Schema(), new MapStoreProperties());
         final Set<StoreTrait> expectedTraits = new HashSet<>(Arrays.asList(
@@ -44,11 +44,11 @@ public void testTraits() throws StoreException {
                 StoreTrait.TRANSFORMATION,
                 StoreTrait.POST_TRANSFORMATION_FILTERING,
                 StoreTrait.MATCHED_VERTEX));
-        assertEquals(expectedTraits, mapStore.getTraits());
+        assertThat(mapStore.getTraits()).isEqualTo(expectedTraits);
     }
 
     @Test
-    public void shouldConfigureCountAllElementsOperationChainOptimiser() throws Exception {
+    void shouldConfigureCountAllElementsOperationChainOptimiser() throws Exception {
         // Given
         final MapStore mapStore = new MapStore();
 
@@ -56,7 +56,7 @@ public void shouldConfigureCountAllElementsOperationChainOptimiser() throws Exce
         mapStore.initialise("graphId", new Schema(), new MapStoreProperties());
 
         // Then
-        assertEquals(1, mapStore.getOperationChainOptimisers().size());
-        assertTrue(mapStore.getOperationChainOptimisers().contains(new CountAllElementsOperationChainOptimiser()));
+        assertThat(mapStore.getOperationChainOptimisers()).hasSize(1);
+        assertThat(mapStore.getOperationChainOptimisers()).contains(new CountAllElementsOperationChainOptimiser());
     }
 }
diff --git a/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/factory/SimpleMapFactoryTest.java b/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/factory/SimpleMapFactoryTest.java
index 51a1bcb3306..d49621aa801 100644
--- a/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/factory/SimpleMapFactoryTest.java
+++ b/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/factory/SimpleMapFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2021 Crown Copyright
+ * Copyright 2017-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package uk.gov.gchq.gaffer.mapstore.factory;
 
 import org.junit.jupiter.api.Test;
@@ -21,7 +22,6 @@
 import uk.gov.gchq.gaffer.mapstore.MapStoreProperties;
 import uk.gov.gchq.gaffer.mapstore.multimap.MapOfSets;
 import uk.gov.gchq.gaffer.mapstore.utils.ElementCloner;
-import uk.gov.gchq.gaffer.store.StoreException;
 import uk.gov.gchq.gaffer.store.schema.Schema;
 
 import java.util.LinkedHashMap;
@@ -29,20 +29,16 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotSame;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
-public class SimpleMapFactoryTest {
+class SimpleMapFactoryTest {
 
     @Test
-    public void shouldThrowExceptionIfMapClassIsInvalid() throws StoreException {
+    void shouldThrowExceptionIfMapClassIsInvalid() {
         // Given
-        final Class mapClass = String.class;
+        final Class<String> mapClass = String.class;
         final Schema schema = mock(Schema.class);
         final MapStoreProperties properties = mock(MapStoreProperties.class);
         final SimpleMapFactory factory = new SimpleMapFactory();
@@ -57,7 +53,7 @@ public void shouldThrowExceptionIfMapClassIsInvalid() throws StoreException {
     }
 
     @Test
-    public void shouldExtractMapClassFromPropertiesWhenInitialised() throws StoreException {
+    void shouldExtractMapClassFromPropertiesWhenInitialised() {
         // Given
         final Class<? extends Map> mapClass = LinkedHashMap.class;
         final Schema schema = mock(Schema.class);
@@ -70,11 +66,11 @@ public void shouldExtractMapClassFromPropertiesWhenInitialised() throws StoreExc
         factory.initialise(schema, properties);
 
         // Then
-        assertEquals(mapClass, factory.getMapClass());
+        assertThat(factory.getMapClass()).isEqualTo(mapClass);
     }
 
     @Test
-    public void shouldCreateNewMapUsingMapClass() throws StoreException {
+    void shouldCreateNewMapUsingMapClass() {
         // Given
         final Class<? extends Map> mapClass = LinkedHashMap.class;
         final Schema schema = mock(Schema.class);
@@ -96,11 +92,11 @@ public void shouldCreateNewMapUsingMapClass() throws StoreException {
         assertThat(map2)
                 .isInstanceOf(LinkedHashMap.class)
                 .isEmpty();
-        assertNotSame(map1, map2);
+        assertThat(map1).isNotSameAs(map2);
     }
 
     @Test
-    public void shouldThrowExceptionIfMapClassCannotBeInstantiated() throws StoreException {
+    void shouldThrowExceptionIfMapClassCannotBeInstantiated() {
         // Given
         final Class<? extends Map> mapClass = Map.class;
         final Schema schema = mock(Schema.class);
@@ -112,11 +108,14 @@ public void shouldThrowExceptionIfMapClassCannotBeInstantiated() throws StoreExc
         factory.initialise(schema, properties);
 
         // When / Then
-        assertThatIllegalArgumentException().isThrownBy(() -> factory.getMap("mapName1", Object.class, Object.class)).extracting("message").isNotNull();
+        assertThatIllegalArgumentException()
+            .isThrownBy(() -> factory.getMap("mapName1", Object.class, Object.class))
+            .extracting("message")
+            .isNotNull();
     }
 
     @Test
-    public void shouldCreateNewMultiMap() throws StoreException {
+    void shouldCreateNewMultiMap() {
         // Given
         final Class<? extends Map> mapClass = LinkedHashMap.class;
         final Schema schema = mock(Schema.class);
@@ -128,19 +127,19 @@ public void shouldCreateNewMultiMap() throws StoreException {
         factory.initialise(schema, properties);
 
         // When
-        final MapOfSets<Object, Object> map1 = (MapOfSets) factory.getMultiMap("mapName1", Object.class, Object.class);
-        final MapOfSets<Object, Object> map2 = (MapOfSets) factory.getMultiMap("mapName2", Object.class, Object.class);
+        final MapOfSets<Object, Object> map1 = (MapOfSets<Object, Object>) factory.getMultiMap("mapName1", Object.class, Object.class);
+        final MapOfSets<Object, Object> map2 = (MapOfSets<Object, Object>) factory.getMultiMap("mapName2", Object.class, Object.class);
 
         // Then
-        assertTrue(map1.getWrappedMap().isEmpty());
-        assertTrue(map1.getWrappedMap().isEmpty());
-        assertTrue(map2.getWrappedMap() instanceof LinkedHashMap);
-        assertTrue(map2.getWrappedMap() instanceof LinkedHashMap);
-        assertNotSame(map1, map2);
+        assertThat(map1.getWrappedMap()).isEmpty();
+        assertThat(map1.getWrappedMap()).isEmpty();
+        assertThat(map2.getWrappedMap()).isInstanceOf(LinkedHashMap.class);
+        assertThat(map2.getWrappedMap()).isInstanceOf(LinkedHashMap.class);
+        assertThat(map1).isNotSameAs(map2);
     }
 
     @Test
-    public void shouldCloneElementUsingCloner() throws StoreException {
+    void shouldCloneElementUsingCloner() {
         // Given
         final ElementCloner elementCloner = mock(ElementCloner.class);
         final Element element = mock(Element.class);
@@ -155,7 +154,8 @@ public void shouldCloneElementUsingCloner() throws StoreException {
 
         // Then
         verify(elementCloner).cloneElement(element, schema);
-        assertSame(expectedClonedElement, clonedElement);
-        assertNotSame(element, clonedElement);
+        assertThat(clonedElement)
+            .isSameAs(expectedClonedElement)
+            .isNotSameAs(element);
     }
 }
diff --git a/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/impl/AddElementsHandlerTest.java b/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/impl/AddElementsHandlerTest.java
index 05770164de7..484225e9e1c 100644
--- a/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/impl/AddElementsHandlerTest.java
+++ b/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/impl/AddElementsHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2020 Crown Copyright
+ * Copyright 2018-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package uk.gov.gchq.gaffer.mapstore.impl;
 
 import org.junit.jupiter.api.Test;
@@ -21,7 +22,6 @@
 import uk.gov.gchq.gaffer.mapstore.MapStore;
 import uk.gov.gchq.gaffer.mapstore.MapStoreProperties;
 import uk.gov.gchq.gaffer.mapstore.SingleUseMapStore;
-import uk.gov.gchq.gaffer.operation.OperationException;
 import uk.gov.gchq.gaffer.operation.impl.add.AddElements;
 import uk.gov.gchq.gaffer.store.Context;
 import uk.gov.gchq.gaffer.store.StoreException;
@@ -29,13 +29,14 @@
 
 import java.util.Arrays;
 
+import static org.assertj.core.api.Assertions.assertThatNoException;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 
-public class AddElementsHandlerTest {
+class AddElementsHandlerTest {
 
     @Test
-    public void shouldAddWithNoGroupByProperties() throws OperationException, StoreException {
+    void shouldAddWithNoGroupByProperties() throws StoreException {
         // Given
         final AddElements addElements = mock(AddElements.class);
         given(addElements.getInput()).willReturn((Iterable) Arrays.asList(new Edge("group1")));
@@ -45,6 +46,6 @@ public void shouldAddWithNoGroupByProperties() throws OperationException, StoreE
         final AddElementsHandler handler = new AddElementsHandler();
 
         // When / Then - should not throw NPE
-        handler.doOperation(addElements, context, store);
+        assertThatNoException().isThrownBy(() -> handler.doOperation(addElements, context, store));
     }
 }
diff --git a/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/impl/CountAllElementsDefaultViewHandlerTest.java b/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/impl/CountAllElementsDefaultViewHandlerTest.java
index 127ea0864e5..c23213ce0fb 100644
--- a/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/impl/CountAllElementsDefaultViewHandlerTest.java
+++ b/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/impl/CountAllElementsDefaultViewHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 Crown Copyright
+ * Copyright 2017-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package uk.gov.gchq.gaffer.mapstore.impl;
 
 import org.junit.jupiter.api.Test;
@@ -21,18 +22,17 @@
 import uk.gov.gchq.gaffer.mapstore.operation.CountAllElementsDefaultView;
 import uk.gov.gchq.gaffer.operation.OperationException;
 import uk.gov.gchq.gaffer.operation.impl.add.AddElements;
-import uk.gov.gchq.gaffer.store.StoreException;
 import uk.gov.gchq.gaffer.user.User;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  *
  */
-public class CountAllElementsDefaultViewHandlerTest {
+class CountAllElementsDefaultViewHandlerTest {
 
     @Test
-    public void testCountAllElementsDefaultViewHandler() throws StoreException, OperationException {
+    void testCountAllElementsDefaultViewHandler() throws OperationException {
         // Given
         final Graph graph = GetAllElementsHandlerTest.getGraph();
         final AddElements addElements = new AddElements.Builder()
@@ -45,11 +45,11 @@ public void testCountAllElementsDefaultViewHandler() throws StoreException, Oper
         final Long result = graph.execute(countAllElementsDefaultView, new User());
 
         // Then
-        assertEquals((long) GetAllElementsHandlerTest.getElements().size(), (long) result);
+        assertThat((long) result).isEqualTo((long) GetAllElementsHandlerTest.getElements().size());
     }
 
     @Test
-    public void shouldApplyVisibilityTraitToOperationResults() throws OperationException {
+    void shouldApplyVisibilityTraitToOperationResults() throws OperationException {
         VisibilityTest.executeOperation(
                 new CountAllElementsDefaultView(),
                 VisibilityTest::elementIterableResultSizeConsumer);
diff --git a/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/impl/DeleteAllDataHandlerTest.java b/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/impl/DeleteAllDataHandlerTest.java
new file mode 100644
index 00000000000..e8969193fb6
--- /dev/null
+++ b/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/impl/DeleteAllDataHandlerTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.mapstore.impl;
+
+import org.junit.jupiter.api.Test;
+
+import uk.gov.gchq.gaffer.graph.Graph;
+import uk.gov.gchq.gaffer.operation.OperationException;
+import uk.gov.gchq.gaffer.operation.impl.add.AddElements;
+import uk.gov.gchq.gaffer.operation.impl.get.GetAllElements;
+import uk.gov.gchq.gaffer.store.operation.DeleteAllData;
+import uk.gov.gchq.gaffer.user.User;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class DeleteAllDataHandlerTest {
+
+    @Test
+    void shouldRemoveAllData() throws OperationException {
+        // Given
+        final Graph graph = GetAllElementsHandlerTest.getGraph();
+        final AddElements addElements = new AddElements.Builder()
+                .input(GetAllElementsHandlerTest.getElements())
+                .build();
+        graph.execute(addElements, new User());
+
+        // When
+        final DeleteAllData deleteAll = new DeleteAllData.Builder().build();
+        graph.execute(deleteAll, new User());
+
+        final GetAllElements getAllElements = new GetAllElements.Builder().build();
+
+        // Then
+        assertThat(graph.execute(getAllElements, new User())).isEmpty();
+    }
+}
diff --git a/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/impl/GetAdjacentIdsTest.java b/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/impl/GetAdjacentIdsTest.java
index 872876460a5..565d2b6ce2f 100644
--- a/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/impl/GetAdjacentIdsTest.java
+++ b/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/impl/GetAdjacentIdsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 Crown Copyright
+ * Copyright 2017-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package uk.gov.gchq.gaffer.mapstore.impl;
 
 import org.junit.jupiter.api.Test;
@@ -39,10 +40,10 @@
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static uk.gov.gchq.gaffer.mapstore.impl.VisibilityTest.VERTEX_1;
 
-public class GetAdjacentIdsTest {
+class GetAdjacentIdsTest {
 
     @Test
-    public void shouldGetAdjacentIdsWhenThereAreNone() throws OperationException {
+    void shouldGetAdjacentIdsWhenThereAreNone() throws OperationException {
         // Given
         final Graph graph = GetAllElementsHandlerTest.getGraph();
         final AddElements addElements = new AddElements.Builder()
@@ -63,7 +64,7 @@ public void shouldGetAdjacentIdsWhenThereAreNone() throws OperationException {
     }
 
     @Test
-    public void shouldGetAdjacentEntityId() throws OperationException {
+    void shouldGetAdjacentEntityId() throws OperationException {
         // Given
         final Graph graph = GetAllElementsHandlerTest.getGraph();
         final AddElements addElements = new AddElements.Builder()
@@ -139,7 +140,7 @@ public void shouldGetAdjacentEntityId() throws OperationException {
     }
 
     @Test
-    public void shouldGetAdjacentEntityIdWithViewRestrictedByGroup() throws OperationException {
+    void shouldGetAdjacentEntityIdWithViewRestrictedByGroup() throws OperationException {
         // Given
         final Graph graph = GetAllElementsHandlerTest.getGraph();
         final AddElements addElements = new AddElements.Builder()
@@ -183,7 +184,7 @@ public void shouldGetAdjacentEntityIdWithViewRestrictedByGroup() throws Operatio
     }
 
     @Test
-    public void shouldGetElementsByEntityIdWithViewRestrictedByGroupAndAPreAggregationFilter()
+    void shouldGetElementsByEntityIdWithViewRestrictedByGroupAndAPreAggregationFilter()
             throws OperationException {
         // Given
         final Graph graph = GetAllElementsHandlerTest.getGraph();
@@ -234,7 +235,7 @@ public void shouldGetElementsByEntityIdWithViewRestrictedByGroupAndAPreAggregati
     }
 
     @Test
-    public void shouldGetElementsByEntityIdWithViewRestrictedByGroupAndAPostAggregationFilter()
+    void shouldGetElementsByEntityIdWithViewRestrictedByGroupAndAPostAggregationFilter()
             throws OperationException {
         // Given
         final Graph graph = GetAllElementsHandlerTest.getGraph();
@@ -285,7 +286,7 @@ public void shouldGetElementsByEntityIdWithViewRestrictedByGroupAndAPostAggregat
     }
 
     @Test
-    public void shouldFailValidationWhenEntityHasFilter() throws OperationException {
+    void shouldFailValidationWhenEntityHasFilter() throws OperationException {
         // Given
         final Graph graph = GetAllElementsHandlerTest.getGraph();
         final AddElements addElements = new AddElements.Builder()
@@ -316,7 +317,7 @@ public void shouldFailValidationWhenEntityHasFilter() throws OperationException
     }
 
     @Test
-    public void shouldPassValidationOnEntitiesWithoutFilters() throws OperationException {
+    void shouldPassValidationOnEntitiesWithoutFilters() throws OperationException {
         // Given
         final Graph graph = GetAllElementsHandlerTest.getGraph();
         final AddElements addElements = new AddElements.Builder()
@@ -368,7 +369,7 @@ public void shouldPassValidationOnEntitiesWithoutFilters() throws OperationExcep
     }
 
     @Test
-    public void shouldApplyVisibilityTraitToOperationResults() throws OperationException {
+    void shouldApplyVisibilityTraitToOperationResults() throws OperationException {
         VisibilityTest.executeOperation(new GetAdjacentIds.Builder().input(new EntitySeed(VERTEX_1)).build(),
                 VisibilityTest::vertex1AdjacentIdsResultConsumer);
     }
diff --git a/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/impl/GetAllElementsHandlerTest.java b/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/impl/GetAllElementsHandlerTest.java
index add5ebe2362..a84c6d1d506 100644
--- a/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/impl/GetAllElementsHandlerTest.java
+++ b/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/impl/GetAllElementsHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 Crown Copyright
+ * Copyright 2017-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package uk.gov.gchq.gaffer.mapstore.impl;
 
 import org.junit.jupiter.api.Test;
@@ -33,7 +34,7 @@
 import uk.gov.gchq.gaffer.operation.OperationException;
 import uk.gov.gchq.gaffer.operation.impl.add.AddElements;
 import uk.gov.gchq.gaffer.operation.impl.get.GetAllElements;
-import uk.gov.gchq.gaffer.store.StoreException;
+import uk.gov.gchq.gaffer.store.Context;
 import uk.gov.gchq.gaffer.store.schema.Schema;
 import uk.gov.gchq.gaffer.user.User;
 import uk.gov.gchq.koryphe.impl.predicate.IsMoreThan;
@@ -57,10 +58,11 @@ public class GetAllElementsHandlerTest {
     static final String PROPERTY1 = "property1";
     static final String PROPERTY2 = "property2";
     static final String COUNT = "count";
+    public static final Context CONTEXT = new Context(new User("user"));
     private static final int NUM_LOOPS = 10;
 
     @Test
-    public void testAddAndGetAllElementsNoAggregation() throws StoreException, OperationException {
+    void testAddAndGetAllElementsNoAggregation() throws OperationException {
         // Given
         final Graph graph = getGraph();
         final AddElements addElements = new AddElements.Builder()
@@ -85,7 +87,7 @@ public void testAddAndGetAllElementsNoAggregation() throws StoreException, Opera
     }
 
     @Test
-    public void testAddAndGetAllElementsWithAggregation() throws StoreException, OperationException {
+    void testAddAndGetAllElementsWithAggregation() throws OperationException {
         // Given
         final Graph graph = getGraph();
         final AddElements addElements = new AddElements.Builder()
@@ -138,7 +140,7 @@ public void testAddAndGetAllElementsWithAggregation() throws StoreException, Ope
     }
 
     @Test
-    public void testGetAllElementsWithViewRestrictedByGroup() throws OperationException {
+    void testGetAllElementsWithViewRestrictedByGroup() throws OperationException {
         // Given
         final Graph graph = getGraph();
         final AddElements addElements = new AddElements.Builder()
@@ -165,7 +167,7 @@ public void testGetAllElementsWithViewRestrictedByGroup() throws OperationExcept
     }
 
     @Test
-    public void testGetAllElementsWithViewRestrictedByGroupAndAPreAggregationFilter() throws OperationException {
+    void testGetAllElementsWithViewRestrictedByGroupAndAPreAggregationFilter() throws OperationException {
         // Given
         final Graph graph = getGraph();
         final AddElements addElements = new AddElements.Builder()
@@ -197,7 +199,7 @@ public void testGetAllElementsWithViewRestrictedByGroupAndAPreAggregationFilter(
     }
 
     @Test
-    public void testGetAllElementsWithViewRestrictedByGroupAndAPostAggregationFilter() throws OperationException {
+    void testGetAllElementsWithViewRestrictedByGroupAndAPostAggregationFilter() throws OperationException {
         // Given
         final Graph graph = getGraph();
         final AddElements addElements = new AddElements.Builder()
@@ -230,7 +232,7 @@ public void testGetAllElementsWithViewRestrictedByGroupAndAPostAggregationFilter
     }
 
     @Test
-    public void testGetAllElementsWithAndWithEntities() throws OperationException {
+    void testGetAllElementsWithAndWithEntities() throws OperationException {
         // Given
         final Graph graph = GetAllElementsHandlerTest.getGraph();
         final AddElements addElements = new AddElements.Builder()
@@ -275,7 +277,7 @@ public void testGetAllElementsWithAndWithEntities() throws OperationException {
     }
 
     @Test
-    public void testGetAllElementsDirectedTypeOption() throws OperationException {
+    void testGetAllElementsDirectedTypeOption() throws OperationException {
         // Given
         final Graph graph = GetAllElementsHandlerTest.getGraph();
         final AddElements addElements = new AddElements.Builder()
@@ -505,9 +507,40 @@ private static List<Element> getElementsForAggregation() {
     }
 
     @Test
-    public void shouldApplyVisibilityTraitToOperationResults() throws OperationException {
+    void shouldApplyVisibilityTraitToOperationResults() throws OperationException {
         VisibilityTest.executeOperation(
                 new GetAllElements.Builder().build(),
                 VisibilityTest::elementIterableResultConsumer);
     }
+
+    @Test
+    void getAllElementsOperationShouldNotContainMatchedVertex() throws Exception {
+
+        final Edge edge = new Edge.Builder()
+                .group(BASIC_EDGE1)
+                .source("A")
+                .dest("B")
+                .build();
+
+        Graph mapStoreGraph = getMapStoreGraph();
+
+        mapStoreGraph.execute(new AddElements.Builder()
+                .input(edge)
+                .build(), CONTEXT);
+
+        Iterable<? extends Element> results = mapStoreGraph.execute(new GetAllElements.Builder()
+                .build(), CONTEXT);
+
+        assertThat(results).extracting(e -> (Element) e).containsExactly(edge);
+
+    }
+
+    private Graph getMapStoreGraph() {
+        return new Graph.Builder()
+                .config(new GraphConfig.Builder().graphId("store1").build())
+                .addSchema(getSchema())
+                .storeProperties(new MapStoreProperties())
+                .build();
+    }
+
 }
diff --git a/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/impl/GetElementsHandlerTest.java b/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/impl/GetElementsHandlerTest.java
index 12508db1081..3e02a1a51f0 100644
--- a/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/impl/GetElementsHandlerTest.java
+++ b/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/impl/GetElementsHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2021 Crown Copyright
+ * Copyright 2017-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package uk.gov.gchq.gaffer.mapstore.impl;
 
 import org.junit.jupiter.api.Test;
@@ -35,7 +36,6 @@
 import uk.gov.gchq.gaffer.operation.graph.SeededGraphFilters.IncludeIncomingOutgoingType;
 import uk.gov.gchq.gaffer.operation.impl.add.AddElements;
 import uk.gov.gchq.gaffer.operation.impl.get.GetElements;
-import uk.gov.gchq.gaffer.store.StoreException;
 import uk.gov.gchq.gaffer.user.User;
 import uk.gov.gchq.koryphe.function.KorypheFunction;
 import uk.gov.gchq.koryphe.impl.predicate.IsMoreThan;
@@ -51,11 +51,11 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
-public class GetElementsHandlerTest {
+class GetElementsHandlerTest {
     private static final int NUM_LOOPS = 10;
 
     @Test
-    public void testGetElementsByNonExistentEntityId() throws OperationException {
+    void testGetElementsByNonExistentEntityId() throws OperationException {
         // Given
         final Graph graph = GetAllElementsHandlerTest.getGraph();
         final AddElements addElements = new AddElements.Builder()
@@ -76,7 +76,7 @@ public void testGetElementsByNonExistentEntityId() throws OperationException {
     }
 
     @Test
-    public void testGetElementsWhenNoEntityIdsProvided() throws OperationException {
+    void testGetElementsWhenNoIdsAreProvided() throws OperationException {
         // Given
         final Graph graph = GetAllElementsHandlerTest.getGraph();
         final AddElements addElements = new AddElements.Builder()
@@ -97,7 +97,7 @@ public void testGetElementsWhenNoEntityIdsProvided() throws OperationException {
     }
 
     @Test
-    public void testGetElementsByNonExistentEdgeId() throws OperationException {
+    void testGetElementsByNonExistentEdgeId() throws OperationException {
         // Given
         final Graph graph = GetAllElementsHandlerTest.getGraph();
         final AddElements addElements = new AddElements.Builder()
@@ -118,28 +118,7 @@ public void testGetElementsByNonExistentEdgeId() throws OperationException {
     }
 
     @Test
-    public void testGetElementsWhenNoEdgeIdsProvided() throws OperationException {
-        // Given
-        final Graph graph = GetAllElementsHandlerTest.getGraph();
-        final AddElements addElements = new AddElements.Builder()
-                .input(getElements())
-                .build();
-        graph.execute(addElements, new User());
-
-        // When
-        final GetElements getElements = new GetElements.Builder()
-                .input(new EmptyIterable<>())
-                .build();
-        final Iterable<? extends Element> results = graph.execute(getElements, new User());
-
-        // Then
-        final Set<Element> resultsSet = new HashSet<>();
-        Streams.toStream(results).forEach(resultsSet::add);
-        assertThat(resultsSet).isEmpty();
-    }
-
-    @Test
-    public void testGetElementsByEntityId() throws OperationException {
+    void testGetElementsByEntityId() throws OperationException {
         // Given
         final Graph graph = GetAllElementsHandlerTest.getGraph();
         final AddElements addElements = new AddElements.Builder()
@@ -176,7 +155,7 @@ public void testGetElementsByEntityId() throws OperationException {
     }
 
     @Test
-    public void testGetElementsByEdgeId() throws OperationException {
+    void testGetElementsByEdgeId() throws OperationException {
         // Given
         final Graph graph = GetAllElementsHandlerTest.getGraph();
         final AddElements addElements = new AddElements.Builder()
@@ -302,7 +281,7 @@ public void testGetElementsByEdgeId() throws OperationException {
     }
 
     @Test
-    public void testAddAndGetAllElementsNoAggregationAndDuplicateElements() throws StoreException, OperationException {
+    void testAddAndGetAllElementsNoAggregationAndDuplicateElements() throws OperationException {
         // Given
         final Graph graph = GetAllElementsHandlerTest.getGraphNoAggregation();
         final AddElements addElements = new AddElements.Builder()
@@ -337,7 +316,7 @@ public void testAddAndGetAllElementsNoAggregationAndDuplicateElements() throws S
     }
 
     @Test
-    public void testGetElementsByEntityIdWithViewRestrictedByGroup() throws OperationException {
+    void testGetElementsByEntityIdWithViewRestrictedByGroup() throws OperationException {
         // Given
         final Graph graph = GetAllElementsHandlerTest.getGraph();
         final AddElements addElements = new AddElements.Builder()
@@ -373,7 +352,7 @@ public void testGetElementsByEntityIdWithViewRestrictedByGroup() throws Operatio
     }
 
     @Test
-    public void testGetElementsByEdgeIdWithViewRestrictedByGroup() throws OperationException {
+    void testGetElementsByEdgeIdWithViewRestrictedByGroup() throws OperationException {
         // Given
         final Graph graph = GetAllElementsHandlerTest.getGraph();
         final AddElements addElements = new AddElements.Builder()
@@ -410,7 +389,7 @@ public void testGetElementsByEdgeIdWithViewRestrictedByGroup() throws OperationE
     }
 
     @Test
-    public void testGetElementsByEntityIdWithViewRestrictedByGroupAndAPreAggregationFilter() throws OperationException {
+    void testGetElementsByEntityIdWithViewRestrictedByGroupAndAPreAggregationFilter() throws OperationException {
         // Given
         final Graph graph = GetAllElementsHandlerTest.getGraph();
         final AddElements addElements = new AddElements.Builder()
@@ -452,7 +431,7 @@ public void testGetElementsByEntityIdWithViewRestrictedByGroupAndAPreAggregation
     }
 
     @Test
-    public void testGetElementsByEdgeIdWithViewRestrictedByGroupAndAPreAggregationFilter() throws OperationException {
+    void testGetElementsByEdgeIdWithViewRestrictedByGroupAndAPreAggregationFilter() throws OperationException {
         // Given
         final Graph graph = GetAllElementsHandlerTest.getGraph();
         final AddElements addElements = new AddElements.Builder()
@@ -495,7 +474,7 @@ public void testGetElementsByEdgeIdWithViewRestrictedByGroupAndAPreAggregationFi
     }
 
     @Test
-    public void testGetElementsByEntityIdWithViewRestrictedByGroupAndAPostAggregationFilter()
+    void testGetElementsByEntityIdWithViewRestrictedByGroupAndAPostAggregationFilter()
             throws OperationException {
         // Given
         final Graph graph = GetAllElementsHandlerTest.getGraph();
@@ -538,7 +517,7 @@ public void testGetElementsByEntityIdWithViewRestrictedByGroupAndAPostAggregatio
     }
 
     @Test
-    public void testGetElementsByEdgeIdWithViewRestrictedByGroupAndAPostAggregationFilter() throws OperationException {
+    void testGetElementsByEdgeIdWithViewRestrictedByGroupAndAPostAggregationFilter() throws OperationException {
         // Given
         final Graph graph = GetAllElementsHandlerTest.getGraph();
         final AddElements addElements = new AddElements.Builder()
@@ -590,7 +569,7 @@ public Integer apply(final Integer input) {
     }
 
     @Test
-    public void testGetElementsByEntityIdWithViewRestrictedByGroupAndATransform() throws OperationException {
+    void testGetElementsByEntityIdWithViewRestrictedByGroupAndATransform() throws OperationException {
         // Given
         final Graph graph = GetAllElementsHandlerTest.getGraph();
         final AddElements addElements = new AddElements.Builder()
@@ -638,7 +617,7 @@ public void testGetElementsByEntityIdWithViewRestrictedByGroupAndATransform() th
     }
 
     @Test
-    public void testGetElementsByEdgeIdWithViewRestrictedByGroupAndATransform() throws OperationException {
+    void testGetElementsByEdgeIdWithViewRestrictedByGroupAndATransform() throws OperationException {
         // Given
         final Graph graph = GetAllElementsHandlerTest.getGraph();
         final AddElements addElements = new AddElements.Builder()
@@ -687,7 +666,7 @@ public void testGetElementsByEdgeIdWithViewRestrictedByGroupAndATransform() thro
     }
 
     @Test
-    public void testGetElementsByEntityIdWithViewRestrictedByGroupAndAPostTransformFilter() throws OperationException {
+    void testGetElementsByEntityIdWithViewRestrictedByGroupAndAPostTransformFilter() throws OperationException {
         // Given
         final Graph graph = GetAllElementsHandlerTest.getGraph();
         final AddElements addElements = new AddElements.Builder()
@@ -733,7 +712,7 @@ public void testGetElementsByEntityIdWithViewRestrictedByGroupAndAPostTransformF
     }
 
     @Test
-    public void testGetElementsByEdgeSeedWithViewRestrictedByGroupAndAPostTransformFilter() throws OperationException {
+    void testGetElementsByEdgeSeedWithViewRestrictedByGroupAndAPostTransformFilter() throws OperationException {
         // Given
         final Graph graph = GetAllElementsHandlerTest.getGraph();
         final AddElements addElements = new AddElements.Builder()
@@ -787,7 +766,7 @@ public void testGetElementsByEdgeSeedWithViewRestrictedByGroupAndAPostTransformF
     }
 
     @Test
-    public void testGetElementsIncludeEntitiesOption() throws OperationException {
+    void testGetElementsIncludeEntitiesOption() throws OperationException {
         // Given
         final Graph graph = GetAllElementsHandlerTest.getGraph();
         final AddElements addElements = new AddElements.Builder()
@@ -847,7 +826,7 @@ public void testGetElementsIncludeEntitiesOption() throws OperationException {
     }
 
     @Test
-    public void testGetElementsDirectedTypeOption() throws OperationException {
+    void testGetElementsDirectedTypeOption() throws OperationException {
         // Given
         final Graph graph = GetAllElementsHandlerTest.getGraph();
         final AddElements addElements = new AddElements.Builder()
@@ -959,7 +938,7 @@ public void testGetElementsDirectedTypeOption() throws OperationException {
     }
 
     @Test
-    public void testGetElementsInOutTypeOption() throws OperationException {
+    void testGetElementsInOutTypeOption() throws OperationException {
         // Given
         final Graph graph = GetAllElementsHandlerTest.getGraph();
         final AddElements addElements = new AddElements.Builder()
@@ -1053,7 +1032,7 @@ public void testGetElementsInOutTypeOption() throws OperationException {
 
     // Test equivalent for seedMatching
     @Test
-    public void testGetElementsSeedMatchingTypeOption() throws OperationException {
+    void testGetElementsSeedMatchingTypeOption() throws OperationException {
         // Given
         final Graph graph = GetAllElementsHandlerTest.getGraph();
         final AddElements addElements = new AddElements.Builder()
@@ -1131,7 +1110,7 @@ public void testGetElementsSeedMatchingTypeOption() throws OperationException {
     }
 
     @Test
-    public void testGetElementsWhenNotMaintainingIndices() throws OperationException {
+    void testGetElementsWhenNotMaintainingIndices() throws OperationException {
         // Given
         final Graph graph = GetAllElementsHandlerTest.getGraphNoIndices();
         final AddElements addElements = new AddElements.Builder()
@@ -1150,7 +1129,7 @@ public void testGetElementsWhenNotMaintainingIndices() throws OperationException
     }
 
     @Test
-    public void testElementsAreClonedBeforeBeingReturned() throws OperationException {
+    void testElementsAreClonedBeforeBeingReturned() throws OperationException {
         // Given
         final Graph graph = GetAllElementsHandlerTest.getGraph();
         final AddElements addElements = new AddElements.Builder()
@@ -1209,7 +1188,7 @@ private static List<Element> getElements() {
     }
 
     @Test
-    public void shouldApplyVisibilityTraitToOperationResults() throws OperationException {
+    void shouldApplyVisibilityTraitToOperationResults() throws OperationException {
         VisibilityTest.executeOperation(
                 new GetElements.Builder()
                         .input(new EntitySeed(VisibilityTest.VERTEX_1), new EntitySeed(VisibilityTest.VERTEX_2))
diff --git a/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/impl/MapImplTest.java b/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/impl/MapImplTest.java
index 13706459775..01345a94134 100644
--- a/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/impl/MapImplTest.java
+++ b/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/impl/MapImplTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 Crown Copyright
+ * Copyright 2017-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package uk.gov.gchq.gaffer.mapstore.impl;
 
 import com.google.common.collect.Sets;
@@ -28,7 +29,6 @@
 import uk.gov.gchq.gaffer.mapstore.MapStoreProperties;
 import uk.gov.gchq.gaffer.mapstore.factory.MapFactory;
 import uk.gov.gchq.gaffer.mapstore.multimap.MultiMap;
-import uk.gov.gchq.gaffer.store.StoreException;
 import uk.gov.gchq.gaffer.store.schema.Schema;
 
 import java.util.Map;
@@ -38,7 +38,7 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 
-public class MapImplTest {
+class MapImplTest {
     private static MapFactory mockMapFactory;
 
     @BeforeEach
@@ -52,14 +52,14 @@ public void after() {
     }
 
     @Test
-    public void shouldCreateMapsUsingMapFactory() throws StoreException {
+    void shouldCreateMapsUsingMapFactory() {
         // Given
         final Schema schema = mock(Schema.class);
         final MapStoreProperties properties = mock(MapStoreProperties.class);
-        final Map aggElements = mock(Map.class);
-        final Map nonAggElements = mock(Map.class);
-        final MultiMap entityIdToElements = mock(MultiMap.class);
-        final MultiMap edgeIdToElements = mock(MultiMap.class);
+        final Map<Element, GroupedProperties> aggElements = mock(Map.class);
+        final Map<Element, Integer> nonAggElements = mock(Map.class);
+        final MultiMap<EntityId, Element> entityIdToElements = mock(MultiMap.class);
+        final MultiMap<EdgeId, Element> edgeIdToElements = mock(MultiMap.class);
 
         given(schema.getGroups()).willReturn(Sets.newHashSet(TestGroups.EDGE));
         given(properties.getMapFactory()).willReturn(TestMapFactory.class.getName());
@@ -80,12 +80,12 @@ public void shouldCreateMapsUsingMapFactory() throws StoreException {
     }
 
     @Test
-    public void shouldNotCreateIndexesIfNotRequired() throws StoreException {
+    void shouldNotCreateIndexesIfNotRequired() {
         // Given
         final Schema schema = mock(Schema.class);
         final MapStoreProperties properties = mock(MapStoreProperties.class);
-        final Map aggElements = mock(Map.class);
-        final Map nonAggElements = mock(Map.class);
+        final Map<Element, GroupedProperties> aggElements = mock(Map.class);
+        final Map<Element, Integer> nonAggElements = mock(Map.class);
 
         given(schema.getGroups()).willReturn(Sets.newHashSet(TestGroups.EDGE));
         given(properties.getMapFactory()).willReturn(TestMapFactory.class.getName());
diff --git a/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/impl/OperationChainTest.java b/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/impl/OperationChainTest.java
index b56ca7482d3..89e7ae20d36 100644
--- a/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/impl/OperationChainTest.java
+++ b/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/impl/OperationChainTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 Crown Copyright
+ * Copyright 2017-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package uk.gov.gchq.gaffer.mapstore.impl;
 
 import org.junit.jupiter.api.Test;
@@ -32,7 +33,6 @@
 import uk.gov.gchq.gaffer.operation.impl.add.AddElements;
 import uk.gov.gchq.gaffer.operation.impl.get.GetAdjacentIds;
 import uk.gov.gchq.gaffer.operation.impl.get.GetElements;
-import uk.gov.gchq.gaffer.store.StoreException;
 import uk.gov.gchq.gaffer.user.User;
 
 import java.util.ArrayList;
@@ -40,12 +40,12 @@
 import java.util.List;
 import java.util.Set;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
-public class OperationChainTest {
+class OperationChainTest {
 
     @Test
-    public void testOperationChain() throws StoreException, OperationException {
+    void testOperationChain() throws OperationException {
         // Given
         final Graph graph = new Graph.Builder()
                 .config(new GraphConfig.Builder()
@@ -82,7 +82,7 @@ public void testOperationChain() throws StoreException, OperationException {
                     return edge.getSource().equals("vertex1") || edge.getDestination().equals("vertex2");
                 })
                 .forEach(expectedResults::add);
-        assertEquals(expectedResults, resultsSet);
+        assertThat(resultsSet).isEqualTo(expectedResults);
     }
 
     private static List<Element> getElements() {
diff --git a/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/integration/MapStoreITs.java b/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/integration/MapStoreITs.java
index 2017b6189b5..03b1975c997 100644
--- a/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/integration/MapStoreITs.java
+++ b/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/integration/MapStoreITs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2022 Crown Copyright
+ * Copyright 2017-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,16 +25,28 @@
 
 import static uk.gov.gchq.gaffer.integration.junit.extensions.IntegrationTestSuiteExtension.INIT_CLASS;
 
+import java.util.AbstractMap.SimpleEntry;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 @ConfigurationParameter(key = INIT_CLASS, value = "uk.gov.gchq.gaffer.mapstore.integration.MapStoreITs")
 public class MapStoreITs extends AbstractStoreITs {
 
-    private static final MapStoreProperties STORE_PROPERTIES =
-            MapStoreProperties.loadStoreProperties(StreamUtil.storeProps(MapStoreITs.class));
+    private static final MapStoreProperties STORE_PROPERTIES = MapStoreProperties
+            .loadStoreProperties(StreamUtil.storeProps(MapStoreITs.class));
 
     private static final Schema SCHEMA = new Schema();
 
+    private static final Map<String, String> TESTS_TO_SKIP = Stream.of(
+            new SimpleEntry<>("shouldConvertFromDomainObjects",
+                    "GeneratorsIT.shouldConvertFromDomainObjects - fails due to potentially incorrect test. See issue #3314"),
+            new SimpleEntry<>("shouldGetElements", "GetElementsIT.shouldGetElements - as above."))
+            .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+
     MapStoreITs() {
         setSchema(SCHEMA);
         setStoreProperties(STORE_PROPERTIES);
+        setTestsToSkip(TESTS_TO_SKIP);
     }
 }
diff --git a/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/multimap/MapOfSetsTest.java b/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/multimap/MapOfSetsTest.java
index 6c447aaf0aa..80a03bf0e58 100644
--- a/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/multimap/MapOfSetsTest.java
+++ b/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/multimap/MapOfSetsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 Crown Copyright
+ * Copyright 2017-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package uk.gov.gchq.gaffer.mapstore.multimap;
 
 import com.google.common.collect.Sets;
 import org.junit.jupiter.api.Test;
 
-import uk.gov.gchq.gaffer.store.StoreException;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -27,16 +26,14 @@
 import java.util.Map;
 import java.util.Set;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
-public class MapOfSetsTest {
+class MapOfSetsTest {
     @Test
-    public void shouldPutValueInExistingMapSet() throws StoreException {
+    void shouldPutValueInExistingMapSet() {
         // Given
         final String key = "key1";
         final String value = "value1";
@@ -51,12 +48,12 @@ public void shouldPutValueInExistingMapSet() throws StoreException {
         final boolean putResult = mapOfSets.put(key, value);
 
         // Then
-        assertTrue(putResult);
+        assertThat(putResult).isTrue();
         verify(set).add(value);
     }
 
     @Test
-    public void shouldPutValueInMapWhenNullSetAndNullSetClass() throws StoreException {
+    void shouldPutValueInMapWhenNullSetAndNullSetClass() {
         // Given
         final String key = "key1";
         final String value = "value1";
@@ -67,12 +64,12 @@ public void shouldPutValueInMapWhenNullSetAndNullSetClass() throws StoreExceptio
         final boolean putResult = mapOfSets.put(key, value);
 
         // Then
-        assertTrue(putResult);
-        assertEquals(Sets.newHashSet(value), mapOfSets.get(key));
+        assertThat(putResult).isTrue();
+        assertThat(mapOfSets.get(key)).isEqualTo(Sets.newHashSet(value));
     }
 
     @Test
-    public void shouldPutValueInMapWhenNullSetAndLinkedHashSetClass() throws StoreException {
+    void shouldPutValueInMapWhenNullSetAndLinkedHashSetClass() {
         // Given
         final String key = "key1";
         final String value = "value1";
@@ -83,12 +80,12 @@ public void shouldPutValueInMapWhenNullSetAndLinkedHashSetClass() throws StoreEx
         final boolean putResult = mapOfSets.put(key, value);
 
         // Then
-        assertTrue(putResult);
-        assertEquals(Sets.newLinkedHashSet(Collections.singleton(value)), map.get(key));
+        assertThat(putResult).isTrue();
+        assertThat(map).containsEntry(key, Sets.newLinkedHashSet(Collections.singleton(value)));
     }
 
     @Test
-    public void shouldGetSetFromMap() throws StoreException {
+    void shouldGetSetFromMap() {
         // Given
         final String key = "key1";
         final Set<String> set = mock(Set.class);
@@ -102,11 +99,11 @@ public void shouldGetSetFromMap() throws StoreException {
 
         // Then
         verify(map).get(key);
-        assertSame(set, result);
+        assertThat(result).isSameAs(set);
     }
 
     @Test
-    public void shouldClearMap() throws StoreException {
+    void shouldClearMap() {
         // Given
         final String key = "key1";
         final Set<String> set = mock(Set.class);
diff --git a/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/optimiser/CountAllElementsOperationChainOptimiserTest.java b/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/optimiser/CountAllElementsOperationChainOptimiserTest.java
index 9c615a4dd60..82fdaf0ac65 100644
--- a/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/optimiser/CountAllElementsOperationChainOptimiserTest.java
+++ b/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/optimiser/CountAllElementsOperationChainOptimiserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Crown Copyright
+ * Copyright 2020-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,11 +33,10 @@
 import java.util.Iterator;
 import java.util.stream.Stream;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.params.provider.Arguments.arguments;
 
-public class CountAllElementsOperationChainOptimiserTest {
+class CountAllElementsOperationChainOptimiserTest {
 
     private static final Operation COUNT_ALL_ELEMENTS_DEFAULT_VIEW = new CountAllElementsDefaultView.Builder().build();
     private static final Operation GET_ALL_ELEMENTS_DEFAULT_VIEW = new GetAllElements.Builder().build();
@@ -51,7 +50,7 @@ public class CountAllElementsOperationChainOptimiserTest {
 
     @ParameterizedTest
     @MethodSource("inputOperationChainAndExpectedOptimizedOperationChain")
-    public void shouldReturnExpectedOptimisedOperationChain(final OperationChain inputOperationChain, final OperationChain expectedOptimisedOperationChain) {
+    void shouldReturnExpectedOptimisedOperationChain(final OperationChain inputOperationChain, final OperationChain expectedOptimisedOperationChain) {
         //Given
         final CountAllElementsOperationChainOptimiser optimiser = new CountAllElementsOperationChainOptimiser();
 
@@ -59,11 +58,11 @@ public void shouldReturnExpectedOptimisedOperationChain(final OperationChain inp
         final OperationChain optimisedOperationChain = optimiser.optimise(inputOperationChain);
 
         // Then
-        assertEquals(expectedOptimisedOperationChain.getOperations().size(), optimisedOperationChain.getOperations().size());
+        assertThat(optimisedOperationChain.getOperations()).hasSameSizeAs(expectedOptimisedOperationChain.getOperations());
         final Iterator<Operation> optimisedOperationsIterator = optimisedOperationChain.getOperations().iterator();
         final Iterator<Operation> expectedOperationsIterator = expectedOptimisedOperationChain.getOperations().iterator();
         while (optimisedOperationsIterator.hasNext()) {
-            assertSame(expectedOperationsIterator.next().getClass(), optimisedOperationsIterator.next().getClass());
+            assertThat(optimisedOperationsIterator.next().getClass()).isSameAs(expectedOperationsIterator.next().getClass());
         }
     }
 
@@ -83,7 +82,7 @@ static Stream<Arguments> inputOperationChainAndExpectedOptimizedOperationChain()
 
     @ParameterizedTest
     @MethodSource("nonOptimisableInputOperationChain")
-    public void shouldNotOptimiseOperationChain(final OperationChain inputOperationChain) {
+    void shouldNotOptimiseOperationChain(final OperationChain inputOperationChain) {
         //Given
         final CountAllElementsOperationChainOptimiser optimiser = new CountAllElementsOperationChainOptimiser();
 
@@ -91,7 +90,7 @@ public void shouldNotOptimiseOperationChain(final OperationChain inputOperationC
         final OperationChain optimisedOperationChain = optimiser.optimise(inputOperationChain);
 
         // Then
-        assertEquals(inputOperationChain.getOperations(), optimisedOperationChain.getOperations());
+        assertThat(optimisedOperationChain.getOperations()).isEqualTo(inputOperationChain.getOperations());
     }
 
     static Stream<Arguments> nonOptimisableInputOperationChain() {
diff --git a/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/utils/ElementClonerTest.java b/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/utils/ElementClonerTest.java
index 296c1294ba7..87f3e74fd07 100644
--- a/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/utils/ElementClonerTest.java
+++ b/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/utils/ElementClonerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 Crown Copyright
+ * Copyright 2017-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package uk.gov.gchq.gaffer.mapstore.utils;
 
 import org.junit.jupiter.api.Test;
@@ -26,10 +27,10 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class ElementClonerTest {
+class ElementClonerTest {
 
     @Test
-    public void testElementCloner() throws StoreException {
+    void testElementCloner() throws StoreException {
         // Given
         final ElementCloner cloner = new ElementCloner();
         final MapStore mapStore = new MapStore();
diff --git a/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/utils/MapWrapperTest.java b/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/utils/MapWrapperTest.java
index c2eed8846fe..a8e95c0dd9f 100644
--- a/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/utils/MapWrapperTest.java
+++ b/store-implementation/map-store/src/test/java/uk/gov/gchq/gaffer/mapstore/utils/MapWrapperTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 Crown Copyright
+ * Copyright 2017-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,26 +13,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package uk.gov.gchq.gaffer.mapstore.utils;
 
 import org.junit.jupiter.api.Test;
 
-import uk.gov.gchq.gaffer.store.StoreException;
-
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
-public class MapWrapperTest {
+class MapWrapperTest {
 
     @Test
-    public void shouldDelegateAllCallsToMap() throws StoreException {
+    void shouldDelegateAllCallsToMap() {
         // Given
         final String key = "key1";
         final String value = "value1";
@@ -62,37 +60,37 @@ public void shouldDelegateAllCallsToMap() throws StoreException {
         // When / Then - put
         final String putResult = wrapper.put(key, value);
         verify(map).put(key, value);
-        assertEquals(value2, putResult);
+        assertThat(putResult).isEqualTo(value2);
 
         // When / Then - get
         final String getResult = wrapper.get(key);
         verify(map).get(key);
-        assertEquals(value, getResult);
+        assertThat(getResult).isEqualTo(value);
 
         // When / Then - size
         final int sizeResult = wrapper.size();
         verify(map).size();
-        assertEquals(size, sizeResult);
+        assertThat(sizeResult).isEqualTo(size);
 
         // When / Then - isEmpty
         final boolean isEmptyResult = wrapper.isEmpty();
         verify(map).size();
-        assertEquals(isEmpty, isEmptyResult);
+        assertThat(isEmptyResult).isEqualTo(isEmpty);
 
         // When / Then - containsKey
         final boolean containsKeyResult = wrapper.containsKey(key);
         verify(map).containsKey(key);
-        assertEquals(containsKey, containsKeyResult);
+        assertThat(containsKeyResult).isEqualTo(containsKey);
 
         // When / Then - containsValue
         final boolean containsValueResult = wrapper.containsValue(value);
         verify(map).containsValue(value);
-        assertEquals(containsValue, containsValueResult);
+        assertThat(containsValueResult).isEqualTo(containsValue);
 
         // When / Then - remove
         final String removeResult = wrapper.remove(key);
         verify(map).remove(key);
-        assertEquals(value, removeResult);
+        assertThat(removeResult).isEqualTo(value);
 
         // When / Then - putAll
         wrapper.putAll(map2);
@@ -105,20 +103,20 @@ public void shouldDelegateAllCallsToMap() throws StoreException {
         // When / Then - keySet
         final Set<String> keySetResult = wrapper.keySet();
         verify(map).keySet();
-        assertSame(keySet, keySetResult);
+        assertThat(keySetResult).isEqualTo(keySet);
 
         // When / Then - values
         final Collection<String> valuesResult = wrapper.values();
         verify(map).values();
-        assertSame(values, valuesResult);
+        assertThat(valuesResult).isSameAs(values);
 
         // When / Then - entrySet
         final Set<Map.Entry<String, String>> entrySetResult = wrapper.entrySet();
         verify(map).entrySet();
-        assertSame(entrySet, entrySetResult);
+        assertThat(entrySetResult).isSameAs(entrySet);
 
         // When / Then - getMap
         final Map<String, String> mapResult = wrapper.getMap();
-        assertSame(map, mapResult);
+        assertThat(mapResult).isSameAs(map);
     }
 }
diff --git a/store-implementation/pom.xml b/store-implementation/pom.xml
index c2634411a05..5005fd2586a 100644
--- a/store-implementation/pom.xml
+++ b/store-implementation/pom.xml
@@ -32,5 +32,6 @@
         <module>map-store</module>
         <module>proxy-store</module>
         <module>federated-store</module>
+        <module>simple-federated-store</module>
     </modules>
 </project>
diff --git a/store-implementation/proxy-store/src/main/java/uk/gov/gchq/gaffer/proxystore/ProxyStore.java b/store-implementation/proxy-store/src/main/java/uk/gov/gchq/gaffer/proxystore/ProxyStore.java
index 648dfcbc163..dd49f4cb214 100644
--- a/store-implementation/proxy-store/src/main/java/uk/gov/gchq/gaffer/proxystore/ProxyStore.java
+++ b/store-implementation/proxy-store/src/main/java/uk/gov/gchq/gaffer/proxystore/ProxyStore.java
@@ -57,6 +57,7 @@
 import uk.gov.gchq.gaffer.store.StoreException;
 import uk.gov.gchq.gaffer.store.StoreProperties;
 import uk.gov.gchq.gaffer.store.StoreTrait;
+import uk.gov.gchq.gaffer.store.operation.DeleteAllData;
 import uk.gov.gchq.gaffer.store.operation.GetSchema;
 import uk.gov.gchq.gaffer.store.operation.GetTraits;
 import uk.gov.gchq.gaffer.store.operation.handler.OperationHandler;
@@ -369,6 +370,11 @@ protected OperationHandler<? extends DeleteElements> getDeleteElementsHandler()
         return null;
     }
 
+    @Override
+    protected OperationHandler<DeleteAllData> getDeleteAllDataHandler() {
+        return null;
+    }
+
     @Override
     protected OutputOperationHandler<GetTraits, Set<StoreTrait>> getGetTraitsHandler() {
         // Create an anonymous class (implementing OutputOperationHandler) which calls fetchTraits with the operation
diff --git a/store-implementation/proxy-store/src/test/java/uk/gov/gchq/gaffer/proxystore/integration/ProxyStoreITs.java b/store-implementation/proxy-store/src/test/java/uk/gov/gchq/gaffer/proxystore/integration/ProxyStoreITs.java
index ac948270998..5ccc36a125c 100644
--- a/store-implementation/proxy-store/src/test/java/uk/gov/gchq/gaffer/proxystore/integration/ProxyStoreITs.java
+++ b/store-implementation/proxy-store/src/test/java/uk/gov/gchq/gaffer/proxystore/integration/ProxyStoreITs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Crown Copyright
+ * Copyright 2016-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,9 @@
 
 import static uk.gov.gchq.gaffer.integration.junit.extensions.IntegrationTestSuiteExtension.INIT_CLASS;
 
+import java.util.Collections;
+import java.util.Map;
+
 @ExcludeClassNamePatterns({"uk.gov.gchq.gaffer.integration.impl.JoinIT",
                            "uk.gov.gchq.gaffer.integration.impl.GeneratorsIT"}) // Skipped because: The output type reference doesn't deserialise the output correctly
 @ConfigurationParameter(key = INIT_CLASS, value = "uk.gov.gchq.gaffer.proxystore.integration.ProxyStoreITs")
@@ -36,8 +39,12 @@ public class ProxyStoreITs extends AbstractStoreITs {
 
     private static final Schema SCHEMA = new Schema();
 
+    private static final Map<String, String> TESTS_TO_SKIP =
+        Collections.singletonMap("shouldGetElements", "GetElementsIT.shouldGetElements - fails due to potentially incorrect test. See issue #3314");
+
     ProxyStoreITs() {
         setSchema(SCHEMA);
         setStoreProperties(STORE_PROPERTIES);
+        setTestsToSkip(TESTS_TO_SKIP);
     }
 }
diff --git a/store-implementation/proxy-store/src/test/java/uk/gov/gchq/gaffer/proxystore/integration/ProxyStoreWithNamedOpNamedViewITs.java b/store-implementation/proxy-store/src/test/java/uk/gov/gchq/gaffer/proxystore/integration/ProxyStoreWithNamedOpNamedViewITs.java
index f3a409f2dd8..3eea4c57527 100644
--- a/store-implementation/proxy-store/src/test/java/uk/gov/gchq/gaffer/proxystore/integration/ProxyStoreWithNamedOpNamedViewITs.java
+++ b/store-implementation/proxy-store/src/test/java/uk/gov/gchq/gaffer/proxystore/integration/ProxyStoreWithNamedOpNamedViewITs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Crown Copyright
+ * Copyright 2023-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,6 +45,9 @@
 import static uk.gov.gchq.gaffer.integration.junit.extensions.IntegrationTestSuiteExtension.INIT_CLASS;
 import static uk.gov.gchq.gaffer.store.StoreProperties.OPERATION_DECLARATIONS_JSON;
 
+import java.util.Collections;
+import java.util.Map;
+
 @ExcludeClassNamePatterns({"uk.gov.gchq.gaffer.integration.impl.JoinIT",
         "uk.gov.gchq.gaffer.integration.impl.GeneratorsIT"}) // Skipped because: The output type reference doesn't deserialise the output correctly
 @ConfigurationParameter(key = INIT_CLASS, value = "uk.gov.gchq.gaffer.proxystore.integration.ProxyStoreWithNamedOpNamedViewITs")
@@ -55,6 +58,9 @@ public class ProxyStoreWithNamedOpNamedViewITs extends AbstractStoreITs {
 
     private static final Schema SCHEMA = new Schema();
 
+    private static final Map<String, String> TESTS_TO_SKIP =
+        Collections.singletonMap("shouldGetElements", "GetElementsIT.shouldGetElements - fails due to potentially incorrect test. See issue #3314");
+
     ProxyStoreWithNamedOpNamedViewITs() {
         setSchema(SCHEMA);
         try {
@@ -79,5 +85,6 @@ public class ProxyStoreWithNamedOpNamedViewITs extends AbstractStoreITs {
             throw new RuntimeException(e);
         }
         setStoreProperties(STORE_PROPERTIES);
+        setTestsToSkip(TESTS_TO_SKIP);
     }
 }
diff --git a/store-implementation/simple-federated-store/pom.xml b/store-implementation/simple-federated-store/pom.xml
new file mode 100644
index 00000000000..e2c4d60fda8
--- /dev/null
+++ b/store-implementation/simple-federated-store/pom.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2024 Crown Copyright
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>uk.gov.gchq.gaffer</groupId>
+        <artifactId>store-implementation</artifactId>
+        <version>${revision}</version>
+    </parent>
+
+    <artifactId>simple-federated-store</artifactId>
+
+    <dependencies>
+        <!-- Gaffer dependencies -->
+        <dependency>
+            <groupId>uk.gov.gchq.gaffer</groupId>
+            <artifactId>store</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>uk.gov.gchq.gaffer</groupId>
+            <artifactId>graph</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>uk.gov.gchq.gaffer</groupId>
+            <artifactId>accumulo-store</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>uk.gov.gchq.gaffer</groupId>
+            <artifactId>map-store</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>uk.gov.gchq.gaffer</groupId>
+            <artifactId>accumulo-store</artifactId>
+            <version>${project.parent.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.accumulo</groupId>
+            <artifactId>accumulo-minicluster</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>uk.gov.gchq.gaffer</groupId>
+            <artifactId>hdfs-library</artifactId>
+            <version>${project.parent.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-hdfs</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>uk.gov.gchq.gaffer</groupId>
+            <artifactId>integration-test</artifactId>
+            <version>${project.parent.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>uk.gov.gchq.gaffer</groupId>
+            <artifactId>integration-test</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/FederatedStore.java b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/FederatedStore.java
new file mode 100644
index 00000000000..4ef634fb56a
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/FederatedStore.java
@@ -0,0 +1,457 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.federated.simple;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import uk.gov.gchq.gaffer.accumulostore.AccumuloProperties;
+import uk.gov.gchq.gaffer.accumulostore.AccumuloStore;
+import uk.gov.gchq.gaffer.cache.Cache;
+import uk.gov.gchq.gaffer.cache.CacheServiceLoader;
+import uk.gov.gchq.gaffer.cache.exception.CacheOperationException;
+import uk.gov.gchq.gaffer.commonutil.exception.OverwritingException;
+import uk.gov.gchq.gaffer.core.exception.GafferRuntimeException;
+import uk.gov.gchq.gaffer.data.element.Element;
+import uk.gov.gchq.gaffer.data.element.id.EntityId;
+import uk.gov.gchq.gaffer.federated.simple.access.GraphAccess;
+import uk.gov.gchq.gaffer.federated.simple.operation.AddGraph;
+import uk.gov.gchq.gaffer.federated.simple.operation.ChangeGraphId;
+import uk.gov.gchq.gaffer.federated.simple.operation.FederatedOperationChainValidator;
+import uk.gov.gchq.gaffer.federated.simple.operation.GetAllGraphIds;
+import uk.gov.gchq.gaffer.federated.simple.operation.GetAllGraphInfo;
+import uk.gov.gchq.gaffer.federated.simple.operation.RemoveGraph;
+import uk.gov.gchq.gaffer.federated.simple.operation.handler.EitherOperationHandler;
+import uk.gov.gchq.gaffer.federated.simple.operation.handler.FederatedOperationHandler;
+import uk.gov.gchq.gaffer.federated.simple.operation.handler.FederatedOutputHandler;
+import uk.gov.gchq.gaffer.federated.simple.operation.handler.add.AddGraphHandler;
+import uk.gov.gchq.gaffer.federated.simple.operation.handler.get.GetAllGraphIdsHandler;
+import uk.gov.gchq.gaffer.federated.simple.operation.handler.get.GetAllGraphInfoHandler;
+import uk.gov.gchq.gaffer.federated.simple.operation.handler.get.GetSchemaHandler;
+import uk.gov.gchq.gaffer.federated.simple.operation.handler.misc.ChangeGraphIdHandler;
+import uk.gov.gchq.gaffer.federated.simple.operation.handler.misc.RemoveGraphHandler;
+import uk.gov.gchq.gaffer.graph.GraphSerialisable;
+import uk.gov.gchq.gaffer.named.operation.AddNamedOperation;
+import uk.gov.gchq.gaffer.named.operation.DeleteNamedOperation;
+import uk.gov.gchq.gaffer.named.operation.GetAllNamedOperations;
+import uk.gov.gchq.gaffer.named.operation.NamedOperation;
+import uk.gov.gchq.gaffer.named.view.AddNamedView;
+import uk.gov.gchq.gaffer.named.view.DeleteNamedView;
+import uk.gov.gchq.gaffer.named.view.GetAllNamedViews;
+import uk.gov.gchq.gaffer.operation.Operation;
+import uk.gov.gchq.gaffer.operation.OperationChain;
+import uk.gov.gchq.gaffer.operation.OperationException;
+import uk.gov.gchq.gaffer.operation.impl.add.AddElements;
+import uk.gov.gchq.gaffer.operation.impl.delete.DeleteElements;
+import uk.gov.gchq.gaffer.operation.impl.get.GetAdjacentIds;
+import uk.gov.gchq.gaffer.operation.impl.get.GetAllElements;
+import uk.gov.gchq.gaffer.operation.impl.get.GetElements;
+import uk.gov.gchq.gaffer.operation.impl.get.GetGraphCreatedTime;
+import uk.gov.gchq.gaffer.serialisation.Serialiser;
+import uk.gov.gchq.gaffer.serialisation.ToBytesSerialiser;
+import uk.gov.gchq.gaffer.store.Context;
+import uk.gov.gchq.gaffer.store.Store;
+import uk.gov.gchq.gaffer.store.StoreException;
+import uk.gov.gchq.gaffer.store.StoreProperties;
+import uk.gov.gchq.gaffer.store.StoreTrait;
+import uk.gov.gchq.gaffer.store.operation.DeleteAllData;
+import uk.gov.gchq.gaffer.store.operation.GetSchema;
+import uk.gov.gchq.gaffer.store.operation.GetTraits;
+import uk.gov.gchq.gaffer.store.operation.OperationChainValidator;
+import uk.gov.gchq.gaffer.store.operation.handler.GetGraphCreatedTimeHandler;
+import uk.gov.gchq.gaffer.store.operation.handler.OperationChainHandler;
+import uk.gov.gchq.gaffer.store.operation.handler.OperationHandler;
+import uk.gov.gchq.gaffer.store.operation.handler.OutputOperationHandler;
+import uk.gov.gchq.gaffer.store.operation.handler.named.AddNamedOperationHandler;
+import uk.gov.gchq.gaffer.store.operation.handler.named.AddNamedViewHandler;
+import uk.gov.gchq.gaffer.store.operation.handler.named.DeleteNamedOperationHandler;
+import uk.gov.gchq.gaffer.store.operation.handler.named.DeleteNamedViewHandler;
+import uk.gov.gchq.gaffer.store.operation.handler.named.GetAllNamedOperationsHandler;
+import uk.gov.gchq.gaffer.store.operation.handler.named.GetAllNamedViewsHandler;
+import uk.gov.gchq.gaffer.store.operation.handler.named.NamedOperationHandler;
+import uk.gov.gchq.gaffer.store.schema.Schema;
+import uk.gov.gchq.gaffer.store.schema.ViewValidator;
+
+import java.util.AbstractMap.SimpleEntry;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static uk.gov.gchq.gaffer.accumulostore.utils.TableUtils.renameTable;
+import static uk.gov.gchq.gaffer.cache.CacheServiceLoader.DEFAULT_SERVICE_NAME;
+import static uk.gov.gchq.gaffer.federated.simple.FederatedStoreProperties.PROP_DEFAULT_GRAPH_IDS;
+import static uk.gov.gchq.gaffer.federated.simple.FederatedStoreProperties.PROP_GRAPH_CACHE_NAME;
+
+/**
+ * The federated store implementation. Provides the set up and required
+ * methods to enable a {@link Store} that will delegate {@link Operation}s
+ * to sub graphs then merge the result.
+ */
+public class FederatedStore extends Store {
+    private static final Logger LOGGER = LoggerFactory.getLogger(FederatedStore.class);
+    /**
+     * The system user account name, this user is essentially an admin for this store.
+     */
+    public static final String FEDERATED_STORE_SYSTEM_USER = "FederatedStoreSystemUser";
+
+    private static final String DEFAULT_CACHE_CLASS_FALLBACK = "uk.gov.gchq.gaffer.cache.impl.HashMapCacheService";
+    private static final String GRAPH_ID_ERROR = "Graph with Graph ID: %s is not available to this federated store";
+
+    // Default graph IDs to execute on
+    private List<String> defaultGraphIds = new LinkedList<>();
+
+    // Gaffer cache of available graphs
+    private Cache<String, Pair<GraphSerialisable, GraphAccess>> graphCache;
+
+    // Store specific handlers
+    public final Map<Class<? extends Operation>, OperationHandler<?>> storeHandlers = Stream.of(
+            new SimpleEntry<>(AddGraph.class, new AddGraphHandler()),
+            new SimpleEntry<>(GetAllGraphIds.class, new GetAllGraphIdsHandler()),
+            new SimpleEntry<>(GetSchema.class, new GetSchemaHandler()),
+            new SimpleEntry<>(ChangeGraphId.class, new ChangeGraphIdHandler()),
+            new SimpleEntry<>(GetAllGraphInfo.class, new GetAllGraphInfoHandler()),
+            new SimpleEntry<>(RemoveGraph.class, new RemoveGraphHandler()))
+        .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+
+    /**
+     * Add a new graph so that it is available to this federated store.
+     *
+     * @param graph The serialisable instance of the graph.
+     * @param graphAccess The graph access.
+     *
+     * @throws IllegalArgumentException If there is already a graph with the supplied ID
+     */
+    public void addGraph(final GraphSerialisable graph, final GraphAccess graphAccess) {
+        // Pair the graph with its access in the cache
+        Pair<GraphSerialisable, GraphAccess> graphAndAccessPair = new ImmutablePair<>(graph, graphAccess);
+        try {
+            // Add safely to the cache
+            graphCache.getCache().putSafe(graph.getGraphId(), graphAndAccessPair);
+        } catch (final CacheOperationException e) {
+            // Unknown issue adding to cache
+            throw new GafferRuntimeException(e.getMessage(), e);
+        } catch (final OverwritingException e) {
+            // Notify that the graph ID is already in use
+            throw new IllegalArgumentException(
+                "A graph with Graph ID: '" + graph.getGraphId() + "' has already been added to this store", e);
+        }
+    }
+
+    /**
+     * Remove a graph from the scope of this store.
+     *
+     * @param graphId The graph ID of the graph to remove.
+     * @throws IllegalArgumentException If graph does not exist.
+     */
+    public void removeGraph(final String graphId) {
+        if (!graphCache.contains(graphId)) {
+            throw new IllegalArgumentException(
+                String.format(GRAPH_ID_ERROR, graphId));
+        }
+        graphCache.deleteFromCache(graphId);
+    }
+
+    /**
+     * Get the {@link GraphSerialisable} from a given graph ID. The graph
+     * must obviously be known to this federated store to be returned.
+     *
+     * @param graphId The graph ID
+     * @return The {@link GraphSerialisable} relating to the ID.
+     * @throws CacheOperationException If issue getting from cache.
+     * @throws IllegalArgumentException If graph not found.
+     */
+    public GraphSerialisable getGraph(final String graphId) throws CacheOperationException {
+        return getGraphAccessPair(graphId).getLeft();
+    }
+
+    /**
+     * Get the {@link GraphAccess} from the given graph ID. The graph
+     * must obviously be known to this federated store to be returned.
+     *
+     * @param graphId The graph ID
+     * @return The {@link GraphAccess} relating to the ID.
+     * @throws CacheOperationException  If issue getting from cache.
+     * @throws IllegalArgumentException If graph not found.
+     */
+    public GraphAccess getGraphAccess(final String graphId) throws CacheOperationException {
+        return getGraphAccessPair(graphId).getRight();
+    }
+
+    /**
+     * Gets the {@link Pair} of {@link GraphSerialisable} and
+     * {@link GraphAccess} from a given graph ID.
+     *
+     * @param graphId The graph ID
+     * @return The {@link Pair} relating to the graph ID.
+     * @throws CacheOperationException  If issue getting from cache.
+     * @throws IllegalArgumentException If graph not found.
+     */
+    public Pair<GraphSerialisable, GraphAccess> getGraphAccessPair(final String graphId) throws CacheOperationException {
+        Pair<GraphSerialisable, GraphAccess> graphAndAccess = graphCache.getFromCache(graphId);
+        if (graphAndAccess == null) {
+            throw new IllegalArgumentException(
+                String.format(GRAPH_ID_ERROR, graphId));
+        }
+        return graphAndAccess;
+    }
+
+    /**
+     * Returns all the graphs and their access available to this store.
+     *
+     * @return Iterable of {@link Pair}s containing the {@link GraphSerialisable}
+     *         and {@link GraphAccess}
+     */
+    public Iterable<Pair<GraphSerialisable, GraphAccess>> getAllGraphsAndAccess() {
+        return graphCache.getCache().getAllValues();
+    }
+
+    /**
+     * Get the default list of graph IDs for this federated store.
+     *
+     * @return The default list.
+     */
+    public List<String> getDefaultGraphIds() {
+        // Only return the graphs that actually exist
+        return defaultGraphIds.stream().filter(id -> {
+            try {
+                return Objects.nonNull(getGraph(id));
+            } catch (final IllegalArgumentException | CacheOperationException e) {
+                LOGGER.warn("Default Graph was not found: {}", id);
+                return false;
+            }
+        }).collect(Collectors.toList());
+    }
+
+    /**
+     * Set the default list of graph IDs for this federated store.
+     *
+     * @param defaultGraphIds Default list to set.
+     */
+    public void setDefaultGraphIds(final List<String> defaultGraphIds) {
+        this.defaultGraphIds = defaultGraphIds;
+    }
+
+    /**
+     * Change the graph's ID for the specified graph.
+     *
+     * @param graphToUpdateId The graph that is to have its ID updated.
+     * @param newGraphId The new graph ID.
+     * @throws StoreException If the accumulo table cannot be renamed.
+     * @throws CacheOperationException If issue getting existing graph from cache.
+     */
+    public void changeGraphId(final String graphToUpdateId, final String newGraphId) throws StoreException, CacheOperationException {
+        // Get existing graph and access
+        final Pair<GraphSerialisable, GraphAccess> graphPairToUpdate = getGraphAccessPair(graphToUpdateId);
+        final GraphSerialisable graphToUpdate = graphPairToUpdate.getLeft();
+        final GraphAccess graphAccess = graphPairToUpdate.getRight();
+
+        // Remove from cache
+        removeGraph(graphToUpdateId);
+
+        // For accumulo update the table with the new graph ID
+        if (graphToUpdate.getStoreProperties().getStoreClass().startsWith(AccumuloStore.class.getPackage().getName())) {
+
+            renameTable((AccumuloProperties) graphToUpdate.getStoreProperties(), graphToUpdateId, newGraphId);
+
+            // Update id in the original graph
+            graphToUpdate.getConfig().setGraphId(newGraphId);
+            GraphSerialisable updatedGraphSerialisable = new GraphSerialisable.Builder(graphToUpdate)
+                .config(graphToUpdate.getConfig())
+                .build();
+            // Add graph with new id back to cache
+            addGraph(updatedGraphSerialisable, graphAccess);
+        } else {
+            // For other stores just re-add with new graph ID
+            graphToUpdate.getConfig().setGraphId(newGraphId);
+            addGraph(graphToUpdate, graphAccess);
+        }
+    }
+
+    /**
+     * Gets a merged schema based on the graphs specified.
+     *
+     * @param graphs The graphs to get the schemas from.
+     * @return A merged {@link Schema}
+     */
+    public Schema getSchema(final List<GraphSerialisable> graphs) {
+        try {
+            // Get the graph IDs we care about
+            List<String> graphIds = new ArrayList<>();
+            graphs.forEach(gs -> graphIds.add(gs.getGraphId()));
+
+            // Create and run a get schema operation with relevant IDs
+            GetSchema operation = new GetSchema.Builder()
+                    .option(FederatedOperationHandler.OPT_SHORT_GRAPH_IDS, String.join(",", graphIds))
+                    .build();
+            return (Schema) this.handleOperation(operation, new Context());
+
+        } catch (final OperationException e) {
+            throw new GafferRuntimeException(e.getMessage(), e);
+        }
+    }
+
+    /**
+     * Access to getting the operations that have handlers specific to this
+     * store e.g. operations that should always be handled specially.
+     *
+     * @return The Operation classes handled by this store.
+     */
+    public Set<Class<? extends Operation>> getStoreSpecificOperations() {
+        return storeHandlers.keySet();
+    }
+
+    @Override
+    public void initialise(final String graphId, final Schema unused, final StoreProperties properties) throws StoreException {
+        super.initialise(graphId, new Schema(), properties);
+
+        // Init the cache for graphs
+        graphCache = new Cache<>(properties.get(PROP_GRAPH_CACHE_NAME, "federatedGraphCache_" + graphId));
+
+        // Get and set default graph IDs from properties
+        if (properties.containsKey(PROP_DEFAULT_GRAPH_IDS)) {
+            // Parse as comma separated list
+            setDefaultGraphIds(Arrays.asList(properties.get(PROP_DEFAULT_GRAPH_IDS).split(",")));
+        }
+    }
+
+    @Override
+    public Schema getSchema() {
+        // Return a blank schema if we have no default graphs
+        if (defaultGraphIds.isEmpty()) {
+            return new Schema();
+        }
+
+        try {
+            return (Schema) this.handleOperation(new GetSchema(), new Context());
+        } catch (final OperationException e) {
+            throw new GafferRuntimeException(e.getMessage(), e);
+        }
+    }
+
+    @Override
+    protected Object doUnhandledOperation(final Operation operation, final Context context) {
+        try {
+            // Use a federated handler so operations are forwarded to graphs
+            return new FederatedOperationHandler<>().doOperation(operation, context, this);
+        } catch (final OperationException e) {
+            throw new GafferRuntimeException(e.getMessage(), e);
+        }
+    }
+
+    @Override
+    protected void addAdditionalOperationHandlers() {
+        storeHandlers.forEach(this::addOperationHandler);
+
+        final String namedOpCacheSuffix = getProperties().getCacheServiceNamedOperationSuffix(getGraphId());
+        final String namedViewCacheSuffix = getProperties().getCacheServiceNamedViewSuffix(getGraphId());
+        final Boolean nestedNamedOpsAllowed = getProperties().isNestedNamedOperationAllow();
+
+        // Add overrides as cache operations could be run locally or on sub graphs
+        if (getProperties().getNamedOperationEnabled()) {
+            addOperationHandler(NamedOperation.class, new EitherOperationHandler<>(new NamedOperationHandler()));
+            addOperationHandler(AddNamedOperation.class, new EitherOperationHandler<>(
+                    new AddNamedOperationHandler(namedOpCacheSuffix, nestedNamedOpsAllowed)));
+            addOperationHandler(GetAllNamedOperations.class, new EitherOperationHandler<>(new GetAllNamedOperationsHandler(namedOpCacheSuffix)));
+            addOperationHandler(DeleteNamedOperation.class, new EitherOperationHandler<>(new DeleteNamedOperationHandler(namedOpCacheSuffix)));
+        }
+
+        // Named Views could be either
+        if (getProperties().getNamedViewEnabled()) {
+            addOperationHandler(AddNamedView.class, new EitherOperationHandler<>(new AddNamedViewHandler(namedViewCacheSuffix)));
+            addOperationHandler(GetAllNamedViews.class, new EitherOperationHandler<>(new GetAllNamedViewsHandler(namedViewCacheSuffix)));
+            addOperationHandler(DeleteNamedView.class, new EitherOperationHandler<>(new DeleteNamedViewHandler(namedViewCacheSuffix)));
+        }
+
+        // Misc operations that could be for sub graphs or not
+        addOperationHandler(GetGraphCreatedTime.class, new EitherOperationHandler<>(new GetGraphCreatedTimeHandler()));
+    }
+
+    @Override
+    protected OperationHandler<? extends OperationChain<?>> getOperationChainHandler() {
+        return new EitherOperationHandler<>(new OperationChainHandler<>(getOperationChainValidator(), getOperationChainOptimisers()));
+    }
+
+    @Override
+    protected OperationChainValidator createOperationChainValidator() {
+        return new FederatedOperationChainValidator(new ViewValidator());
+    }
+
+    @Override
+    protected OutputOperationHandler<GetElements, Iterable<? extends Element>> getGetElementsHandler() {
+        return new FederatedOutputHandler<>();
+    }
+
+    @Override
+    protected OutputOperationHandler<GetAllElements, Iterable<? extends Element>> getGetAllElementsHandler() {
+        return new FederatedOutputHandler<>();
+    }
+
+    @Override
+    protected OutputOperationHandler<? extends GetAdjacentIds, Iterable<? extends EntityId>> getAdjacentIdsHandler() {
+        return new FederatedOutputHandler<>();
+    }
+
+    @Override
+    protected OperationHandler<? extends AddElements> getAddElementsHandler() {
+        return new FederatedOperationHandler<>();
+    }
+
+    @Override
+    protected OperationHandler<? extends DeleteElements> getDeleteElementsHandler() {
+        return new FederatedOperationHandler<>();
+    }
+
+    @Override
+    protected OperationHandler<DeleteAllData> getDeleteAllDataHandler() {
+        return new FederatedOperationHandler<>();
+    }
+
+    @Override
+    protected OutputOperationHandler<GetTraits, Set<StoreTrait>> getGetTraitsHandler() {
+        return new FederatedOutputHandler<>();
+    }
+
+    @Override
+    protected Class<? extends Serialiser> getRequiredParentSerialiserClass() {
+        return ToBytesSerialiser.class;
+    }
+
+    @Override
+    protected Class<FederatedStoreProperties> getPropertiesClass() {
+        return FederatedStoreProperties.class;
+    }
+
+    @Override
+    protected void startCacheServiceLoader(final StoreProperties properties) {
+        super.startCacheServiceLoader(properties);
+        // If default not setup then initialise cache as its needed for storing graphs
+        if (!CacheServiceLoader.isDefaultEnabled()) {
+            CacheServiceLoader.initialise(
+                DEFAULT_SERVICE_NAME,
+                DEFAULT_CACHE_CLASS_FALLBACK,
+                properties.getProperties());
+        }
+    }
+}
diff --git a/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/FederatedStoreProperties.java b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/FederatedStoreProperties.java
new file mode 100644
index 00000000000..d569731b440
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/FederatedStoreProperties.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.federated.simple;
+
+import uk.gov.gchq.gaffer.store.StoreProperties;
+
+import java.io.InputStream;
+import java.nio.file.Path;
+
+public class FederatedStoreProperties extends StoreProperties {
+    /**
+     * Property key for federated stores default graph IDs
+     */
+    public static final String PROP_DEFAULT_GRAPH_IDS = "gaffer.store.federated.default.graphIds";
+    /**
+     * Property key for setting if the default is to apply element aggregation or not
+     */
+    public static final String PROP_DEFAULT_MERGE_ELEMENTS = "gaffer.store.federated.default.aggregateElements";
+    /**
+     * Property key for setting if public graphs can be added to the store or not
+     */
+    public static final String PROP_ALLOW_PUBLIC_GRAPHS = "gaffer.store.federated.allowPublicGraphs";
+    /**
+     * Property key for setting a custom name for the graph cache, by default
+     * this will be "federatedGraphCache_" followed by the federated graph ID.
+     */
+    public static final String PROP_GRAPH_CACHE_NAME = "gaffer.store.federated.graphCache.name";
+    /**
+     * Property key for the class to use when merging number results
+     */
+    public static final String PROP_MERGE_CLASS_NUMBER = "gaffer.store.federated.merge.number.class";
+    /**
+     * Property key for the class to use when merging string results
+     */
+    public static final String PROP_MERGE_CLASS_STRING = "gaffer.store.federated.merge.string.class";
+    /**
+     * Property key for the class to use when merging boolean results
+     */
+    public static final String PROP_MERGE_CLASS_BOOLEAN = "gaffer.store.federated.merge.boolean.class";
+    /**
+     * Property key for the class to use when merging collection results
+     */
+    public static final String PROP_MERGE_CLASS_COLLECTION = "gaffer.store.federated.merge.collection.class";
+    /**
+     * Property key for the class to use when merging values of a Map result
+     */
+    public static final String PROP_MERGE_CLASS_MAP = "gaffer.store.federated.merge.map.class";
+    /**
+     * Property key for the class to use when merging elements
+     */
+    public static final String PROP_MERGE_CLASS_ELEMENTS = "gaffer.store.federated.merge.elements.class";
+
+    public FederatedStoreProperties() {
+        super(FederatedStore.class);
+    }
+
+    public FederatedStoreProperties(final Path propFileLocation) {
+        super(propFileLocation, FederatedStore.class);
+    }
+
+    public static FederatedStoreProperties loadStoreProperties(final String pathStr) {
+        return StoreProperties.loadStoreProperties(pathStr, FederatedStoreProperties.class);
+    }
+
+    public static FederatedStoreProperties loadStoreProperties(final InputStream storePropertiesStream) {
+        return StoreProperties.loadStoreProperties(storePropertiesStream, FederatedStoreProperties.class);
+    }
+
+    public static FederatedStoreProperties loadStoreProperties(final Path storePropertiesPath) {
+        return StoreProperties.loadStoreProperties(storePropertiesPath, FederatedStoreProperties.class);
+    }
+}
diff --git a/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/access/GraphAccess.java b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/access/GraphAccess.java
new file mode 100644
index 00000000000..c9aa8d1e268
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/access/GraphAccess.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.federated.simple.access;
+
+import uk.gov.gchq.gaffer.access.AccessControlledResource;
+import uk.gov.gchq.gaffer.access.ResourceType;
+import uk.gov.gchq.gaffer.access.predicate.AccessPredicate;
+import uk.gov.gchq.gaffer.access.predicate.UnrestrictedAccessPredicate;
+import uk.gov.gchq.gaffer.user.User;
+
+import static uk.gov.gchq.gaffer.federated.simple.FederatedStore.FEDERATED_STORE_SYSTEM_USER;
+
+/**
+ * Access control for a Graph that as been added through a federated store.
+ */
+public class GraphAccess implements AccessControlledResource  {
+    // Default accesses applied to a graph can be overridden using builder
+    private boolean isPublic = true;
+    private String owner = User.UNKNOWN_USER_ID;
+    private AccessPredicate readAccessPredicate = new UnrestrictedAccessPredicate();
+    private AccessPredicate writeAccessPredicate = new UnrestrictedAccessPredicate();
+
+    public boolean isPublic() {
+        return isPublic;
+    }
+
+    public String getOwner() {
+        return owner;
+    }
+
+    public AccessPredicate getReadAccessPredicate() {
+        return readAccessPredicate;
+    }
+
+    public AccessPredicate getWriteAccessPredicate() {
+        return writeAccessPredicate;
+    }
+
+    @Override
+    public ResourceType getResourceType() {
+        return ResourceType.FederatedStoreGraph;
+    }
+
+    @Override
+    public boolean hasReadAccess(final User user, final String adminAuth) {
+        return isPublic()
+            || user.getUserId().equals(FEDERATED_STORE_SYSTEM_USER)
+            || readAccessPredicate.test(user, adminAuth);
+    }
+
+    @Override
+    public boolean hasWriteAccess(final User user, final String adminAuth) {
+        return user.getUserId().equals(FEDERATED_STORE_SYSTEM_USER)
+            || writeAccessPredicate.test(user, adminAuth);
+    }
+
+    public static class Builder {
+        GraphAccess graphAccess = new GraphAccess();
+
+        public GraphAccess build() {
+            return graphAccess;
+        }
+
+        public Builder isPublic(final boolean isPublic) {
+            graphAccess.isPublic = isPublic;
+            return this;
+        }
+
+        public Builder owner(final String owner) {
+            graphAccess.owner = owner;
+            return this;
+        }
+
+        public Builder readAccessPredicate(final AccessPredicate readAccessPredicate) {
+            graphAccess.readAccessPredicate = readAccessPredicate;
+            return this;
+        }
+
+        public Builder writeAccessPredicate(final AccessPredicate writeAccessPredicate) {
+            graphAccess.writeAccessPredicate = writeAccessPredicate;
+            return this;
+        }
+    }
+
+}
diff --git a/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/merge/DefaultResultAccumulator.java b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/merge/DefaultResultAccumulator.java
new file mode 100644
index 00000000000..016a5e5a957
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/merge/DefaultResultAccumulator.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.federated.simple.merge;
+
+import org.apache.commons.collections4.IterableUtils;
+
+import uk.gov.gchq.gaffer.data.element.Element;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * The default result accumulator for merging results from multiple graphs into one.
+ */
+public class DefaultResultAccumulator<T> extends FederatedResultAccumulator<T> {
+
+    public DefaultResultAccumulator() {
+        super();
+    }
+
+    public DefaultResultAccumulator(final Properties properties) {
+        super(properties);
+    }
+
+    /**
+     * Concatenates the result from a graph with the previous result.
+     *
+     * @param update    the result to be added
+     * @param state     the previous results
+     */
+    @SuppressWarnings("unchecked")
+    @Override
+    public T apply(final T update, final T state) {
+        // Don't update if null
+        if (update == null) {
+            return state;
+        }
+
+        // Use configured number merger
+        if (state instanceof Number) {
+            return (T) this.numberMergeOperator.apply((Number) update, (Number) state);
+        }
+
+        // Use configured string merger
+        if (state instanceof String) {
+            return (T) this.stringMergeOperator.apply((String) update, (String) state);
+        }
+
+        // Use configured boolean merger
+        if (state instanceof Boolean) {
+            return (T) this.booleanMergeOperator.apply((Boolean) update, (Boolean) state);
+        }
+
+        // Use configured collection merger
+        if (state instanceof Collection<?>) {
+            return (T) this.collectionMergeOperator.apply((Collection<Object>) update, (Collection<Object>) state);
+        }
+
+        // Use configured merger for maps
+        if (update instanceof Map) {
+            return (T) this.mapMergeOperator.apply((Map<Object, Object>) update, (Map<Object, Object>) state);
+        }
+
+        // If an iterable try merge them
+        if (update instanceof Iterable<?>) {
+            Iterable<?> updateIterable = (Iterable<?>) update;
+            // If nothing to update then exit
+            if (!updateIterable.iterator().hasNext()) {
+                return state;
+            }
+
+            // Should we use the element aggregate operator
+            if ((this.aggregateElements) && (updateIterable.iterator().next() instanceof Element))  {
+                return (T) this.elementAggregateOperator.apply((Iterable<Element>) update, (Iterable<Element>) state);
+            }
+
+            // By default just chain iterables together
+            // (need to use the iterator to make sure the FluentIterable under the hood serialises correctly)
+            Iterable<Object> chained = () -> IterableUtils.chainedIterable((Iterable<?>) state, updateIterable).iterator();
+            return (T) chained;
+        }
+
+        // Fallback just return the update
+        return update;
+    }
+}
diff --git a/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/merge/FederatedResultAccumulator.java b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/merge/FederatedResultAccumulator.java
new file mode 100644
index 00000000000..83e8eecb5ce
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/merge/FederatedResultAccumulator.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.federated.simple.merge;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import uk.gov.gchq.gaffer.data.element.Element;
+import uk.gov.gchq.gaffer.federated.simple.merge.operator.ElementAggregateOperator;
+import uk.gov.gchq.gaffer.store.schema.Schema;
+import uk.gov.gchq.koryphe.binaryoperator.BinaryOperatorMap;
+import uk.gov.gchq.koryphe.impl.binaryoperator.And;
+import uk.gov.gchq.koryphe.impl.binaryoperator.CollectionConcat;
+import uk.gov.gchq.koryphe.impl.binaryoperator.Last;
+import uk.gov.gchq.koryphe.impl.binaryoperator.StringConcat;
+import uk.gov.gchq.koryphe.impl.binaryoperator.Sum;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Properties;
+import java.util.function.BinaryOperator;
+
+import static uk.gov.gchq.gaffer.federated.simple.FederatedStoreProperties.PROP_DEFAULT_MERGE_ELEMENTS;
+import static uk.gov.gchq.gaffer.federated.simple.FederatedStoreProperties.PROP_MERGE_CLASS_BOOLEAN;
+import static uk.gov.gchq.gaffer.federated.simple.FederatedStoreProperties.PROP_MERGE_CLASS_COLLECTION;
+import static uk.gov.gchq.gaffer.federated.simple.FederatedStoreProperties.PROP_MERGE_CLASS_ELEMENTS;
+import static uk.gov.gchq.gaffer.federated.simple.FederatedStoreProperties.PROP_MERGE_CLASS_MAP;
+import static uk.gov.gchq.gaffer.federated.simple.FederatedStoreProperties.PROP_MERGE_CLASS_NUMBER;
+import static uk.gov.gchq.gaffer.federated.simple.FederatedStoreProperties.PROP_MERGE_CLASS_STRING;
+
+/**
+ * Abstract base class for accumulators that merge results from multiple
+ * graphs together. Has default operators set for common data types.
+ */
+public abstract class FederatedResultAccumulator<T> implements BinaryOperator<T> {
+    private static final Logger LOGGER = LoggerFactory.getLogger(FederatedResultAccumulator.class);
+
+    // Default merge operators for different data types
+    protected BinaryOperator<Number> numberMergeOperator = new Sum();
+    protected BinaryOperator<String> stringMergeOperator = new StringConcat();
+    protected BinaryOperator<Boolean> booleanMergeOperator = new And();
+    protected BinaryOperator<Collection<Object>> collectionMergeOperator = new CollectionConcat<>();
+    protected BinaryOperator<Iterable<Element>> elementAggregateOperator = new ElementAggregateOperator();
+    // For map merging define a sub operator for if values are the same
+    protected BinaryOperator<Object> mapValueMergeOperator = new Last();
+    protected BinaryOperator<Map<Object, Object>> mapMergeOperator = new BinaryOperatorMap<>(mapValueMergeOperator);
+
+    // Should the element aggregation operator be used, can be slower so disabled by default
+    protected boolean aggregateElements = false;
+
+    protected FederatedResultAccumulator() {
+        // Construct with defaults
+    }
+
+    protected FederatedResultAccumulator(final Properties properties) {
+        // Use the store properties to configure the merging
+        if (properties.containsKey(PROP_MERGE_CLASS_NUMBER)) {
+            numberMergeOperator = loadMergeClass(numberMergeOperator, properties.get(PROP_MERGE_CLASS_NUMBER));
+        }
+        if (properties.containsKey(PROP_MERGE_CLASS_STRING)) {
+            stringMergeOperator = loadMergeClass(stringMergeOperator, properties.get(PROP_MERGE_CLASS_STRING));
+        }
+        if (properties.containsKey(PROP_MERGE_CLASS_BOOLEAN)) {
+            booleanMergeOperator = loadMergeClass(booleanMergeOperator, properties.get(PROP_MERGE_CLASS_BOOLEAN));
+        }
+        if (properties.containsKey(PROP_MERGE_CLASS_COLLECTION)) {
+            collectionMergeOperator = loadMergeClass(collectionMergeOperator, properties.get(PROP_MERGE_CLASS_COLLECTION));
+        }
+        if (properties.containsKey(PROP_MERGE_CLASS_ELEMENTS)) {
+            elementAggregateOperator = loadMergeClass(elementAggregateOperator, properties.get(PROP_MERGE_CLASS_ELEMENTS));
+        }
+        if (properties.containsKey(PROP_MERGE_CLASS_MAP)) {
+            mapValueMergeOperator = loadMergeClass(mapValueMergeOperator, properties.get(PROP_MERGE_CLASS_MAP));
+            mapMergeOperator = new BinaryOperatorMap<>(mapValueMergeOperator);
+        }
+        // Should we do element aggregation by default
+        if (properties.containsKey(PROP_DEFAULT_MERGE_ELEMENTS)) {
+            setAggregateElements(Boolean.parseBoolean((String) properties.get(PROP_DEFAULT_MERGE_ELEMENTS)));
+        }
+    }
+
+    /**
+     * Set whether the element aggregation operator should be used. This will
+     * attempt to aggregate elements based on the current schema.
+     *
+     * @param aggregateElements should elements be aggregated.
+     */
+    public void setAggregateElements(final boolean aggregateElements) {
+        this.aggregateElements = aggregateElements;
+    }
+
+    /**
+     * Access to see if this accumulator is set to try element aggregation or
+     * not.
+     *
+     * @return Is aggregation set.
+     */
+    public boolean aggregateElements() {
+        return aggregateElements;
+    }
+
+    /**
+     * Sets the schema to use for the {@link ElementAggregateOperator}.
+     *
+     * @param schema The schema.
+     */
+    public void setSchema(final Schema schema) {
+        ((ElementAggregateOperator) elementAggregateOperator).setSchema(schema);
+    }
+
+    @SuppressWarnings("unchecked")
+    private <I> BinaryOperator<I> loadMergeClass(final BinaryOperator<I> originalOperator, final Object clazzName) {
+        BinaryOperator<I> mergeOperator = originalOperator;
+        try {
+            Class<?> clazz = Class.forName((String) clazzName);
+            mergeOperator = (BinaryOperator<I>) clazz.newInstance();
+        } catch (final ClassCastException | ClassNotFoundException | InstantiationException | IllegalAccessException e) {
+            LOGGER.warn("Failed to load alternative merge function: {} The default will be used instead.", clazzName);
+        }
+        return mergeOperator;
+    }
+}
diff --git a/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/merge/operator/ElementAggregateOperator.java b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/merge/operator/ElementAggregateOperator.java
new file mode 100644
index 00000000000..40fda531dbd
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/merge/operator/ElementAggregateOperator.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.federated.simple.merge.operator;
+
+import org.apache.commons.collections4.IterableUtils;
+
+import uk.gov.gchq.gaffer.data.element.Edge;
+import uk.gov.gchq.gaffer.data.element.Element;
+import uk.gov.gchq.gaffer.data.element.Entity;
+import uk.gov.gchq.gaffer.data.element.function.ElementAggregator;
+import uk.gov.gchq.gaffer.store.schema.Schema;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.function.BinaryOperator;
+import java.util.stream.Collectors;
+
+/**
+ * Operator for aggregating two iterables of {@link Element}s together, this
+ * will ensure all properties for similar elements are merged using the
+ * {@link ElementAggregator} from the schema to perform the actual aggregation.
+ */
+public class ElementAggregateOperator implements BinaryOperator<Iterable<Element>> {
+
+    // The schema to use for pulling aggregation functions from
+    private Schema schema;
+
+    /**
+     * Set the schema to use for aggregating elements of the same group
+     *
+     * @param schema The schema.
+     */
+    public void setSchema(final Schema schema) {
+        this.schema = schema;
+    }
+
+    @Override
+    public Iterable<Element> apply(final Iterable<Element> update, final Iterable<Element> state) {
+        // Just append the state and update so we can loop over it to do accurate merging
+        // We can't use the original iterators directly in case they close or become exhausted so save to a Set first.
+        Set<Element> chainedResult = new HashSet<>(IterableUtils.toList(IterableUtils.chainedIterable(update, state)));
+
+        // Iterate over the chained result to merge the elements with each other
+        // Collect to a set to ensure deduplication
+        return chainedResult.stream()
+            .map(e -> {
+                Element result = e;
+                // Set up the aggregator for this group based on the schema
+                ElementAggregator aggregator = new ElementAggregator();
+                if (schema != null) {
+                    aggregator = schema.getElement(e.getGroup()).getIngestAggregator();
+                }
+                // Compare the current element with all others to do a full merge
+                for (final Element inner : chainedResult) {
+                    // No merge required if not in same group
+                    if (!e.getGroup().equals(inner.getGroup()) || e.equals(inner)) {
+                        continue;
+                    }
+
+                    if ((e instanceof Entity)
+                            && (inner instanceof Entity)
+                            && ((Entity) e).getVertex().equals(((Entity) inner).getVertex())) {
+                        result = aggregator.apply(inner.shallowClone(), result).shallowClone();
+                    }
+
+                    if ((e instanceof Edge)
+                            && (inner instanceof Edge)
+                            && ((Edge) e).getSource().equals(((Edge) inner).getSource())
+                            && ((Edge) e).getDestination().equals(((Edge) inner).getDestination())
+                            && ((Edge) e).getDirectedType().equals(((Edge) inner).getDirectedType())) {
+                        result = aggregator.apply(inner.shallowClone(), result);
+                    }
+                }
+                return result;
+            })
+            .collect(Collectors.toSet());
+    }
+
+}
diff --git a/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/AddGraph.java b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/AddGraph.java
new file mode 100644
index 00000000000..ffbe54210e0
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/AddGraph.java
@@ -0,0 +1,219 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.federated.simple.operation;
+
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+import org.apache.commons.lang3.exception.CloneFailedException;
+
+import uk.gov.gchq.gaffer.access.predicate.AccessPredicate;
+import uk.gov.gchq.gaffer.commonutil.Required;
+import uk.gov.gchq.gaffer.graph.GraphConfig;
+import uk.gov.gchq.gaffer.operation.Operation;
+import uk.gov.gchq.gaffer.store.schema.Schema;
+import uk.gov.gchq.koryphe.Since;
+import uk.gov.gchq.koryphe.Summary;
+
+import java.util.Map;
+import java.util.Properties;
+
+@Since("2.4.0")
+@Summary("Adds a new Graph to the federated store")
+@JsonPropertyOrder(value = { "class", "graphConfig" }, alphabetic = true)
+public class AddGraph implements Operation {
+
+    @Required
+    private GraphConfig graphConfig;
+    private Schema schema;
+    private Properties properties;
+    private String owner;
+    private Boolean isPublic;
+    private AccessPredicate readPredicate;
+    private AccessPredicate writePredicate;
+    private Map<String, String> options;
+
+    // Getters
+
+    /**
+     * Get current set {@link GraphConfig}.
+     *
+     * @return The graph config.
+     */
+    public GraphConfig getGraphConfig() {
+        return graphConfig;
+    }
+
+    /**
+     * Get the current set {@link Schema}.
+     *
+     * @return The schema.
+     */
+    public Schema getSchema() {
+        return schema;
+    }
+
+    /**
+     * Get the current set {@link Properties} for the store.
+     *
+     * @return The properties for the store.
+     */
+    public Properties getProperties() {
+        return properties;
+    }
+
+    public String getOwner() {
+        return owner;
+    }
+
+    public Boolean isPublic() {
+        return isPublic;
+    }
+
+    public AccessPredicate getReadPredicate() {
+        return readPredicate;
+    }
+
+    public AccessPredicate getWritePredicate() {
+        return writePredicate;
+    }
+
+    // Setters
+
+    /**
+     * Set the {@link GraphConfig}.
+     *
+     * @param graphConfig The config to set.
+     */
+    public void setGraphConfig(final GraphConfig graphConfig) {
+        this.graphConfig = graphConfig;
+    }
+
+    /**
+     * Set the {@link Schema}.
+     *
+     * @param schema The schema to set.
+     */
+    public void setSchema(final Schema schema) {
+        this.schema = schema;
+    }
+
+    /**
+     * Set the {@link Properties} for the store.
+     *
+     * @param properties The properties to set.
+     */
+    public void setProperties(final Properties properties) {
+        this.properties = properties;
+    }
+
+    public void setOwner(final String owner) {
+        this.owner = owner;
+    }
+
+    public void setIsPublic(final Boolean isPublic) {
+        this.isPublic = isPublic;
+    }
+
+    public void setReadPredicate(final AccessPredicate readPredicate) {
+        this.readPredicate = readPredicate;
+    }
+
+    public void setWritePredicate(final AccessPredicate writePredicate) {
+        this.writePredicate = writePredicate;
+    }
+
+    @Override
+    public Map<String, String> getOptions() {
+        return options;
+    }
+
+    @Override
+    public void setOptions(final Map<String, String> options) {
+        this.options = options;
+    }
+
+    @Override
+    public Operation shallowClone() throws CloneFailedException {
+        return new AddGraph.Builder()
+                .graphConfig(graphConfig)
+                .schema(schema)
+                .properties(properties)
+                .readPredicate(readPredicate)
+                .writePredicate(writePredicate)
+                .options(options)
+                .build();
+    }
+
+    public static class Builder extends Operation.BaseBuilder<AddGraph, Builder> {
+        public Builder() {
+            super(new AddGraph());
+        }
+
+        /**
+         * Set the {@link GraphConfig}.
+         *
+         * @param graphConfig The config to set.
+         * @return The builder.
+         */
+        public Builder graphConfig(final GraphConfig graphConfig) {
+            _getOp().setGraphConfig(graphConfig);
+            return _self();
+        }
+
+        /**
+         * Set the {@link Schema}.
+         *
+         * @param schema The schema to set.
+         * @return The builder.
+         */
+        public Builder schema(final Schema schema) {
+            _getOp().setSchema(schema);
+            return _self();
+        }
+
+        /**
+         * Set the {@link Properties} for the store.
+         *
+         * @param properties The properties to set.
+         * @return The builder.
+         */
+        public Builder properties(final Properties properties) {
+            _getOp().setProperties(properties);
+            return _self();
+        }
+
+        public Builder owner(final String owner) {
+            _getOp().setOwner(owner);
+            return _self();
+        }
+
+        public Builder isPublic(final Boolean isPublic) {
+            _getOp().setIsPublic(isPublic);
+            return _self();
+        }
+
+        public Builder readPredicate(final AccessPredicate readPredicate) {
+            _getOp().setReadPredicate(readPredicate);
+            return _self();
+        }
+
+        public Builder writePredicate(final AccessPredicate writePredicate) {
+            _getOp().setWritePredicate(writePredicate);
+            return _self();
+        }
+    }
+}
diff --git a/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/ChangeGraphId.java b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/ChangeGraphId.java
new file mode 100644
index 00000000000..a3d692cae25
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/ChangeGraphId.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.federated.simple.operation;
+
+import org.apache.commons.lang3.exception.CloneFailedException;
+
+import uk.gov.gchq.gaffer.operation.Operation;
+import uk.gov.gchq.koryphe.Since;
+import uk.gov.gchq.koryphe.Summary;
+
+import java.util.Map;
+
+@Since("2.4.0")
+@Summary("Changes Graph ID")
+public class ChangeGraphId implements Operation {
+
+    private String graphId;
+    private String newGraphId;
+    private Map<String, String> options;
+
+    // Getters
+    /**
+     * Get the graph ID that will be changed.
+     *
+     * @return the graph ID
+     */
+    public String getGraphId() {
+        return graphId;
+    }
+
+    /**
+     * Get the new ID for the graph.
+     *
+     * @return the new graph ID
+     */
+    public String getNewGraphId() {
+        return newGraphId;
+    }
+
+    // Setters
+    /**
+     * Set the graph ID of the current graph.
+     *
+     * @param graphId the graph ID
+     */
+    public void setGraphId(final String graphId) {
+        this.graphId = graphId;
+    }
+
+     /**
+     * Set the new graph ID of the current graph.
+     *
+     * @param newGraphId the new Graph ID
+     */
+    public void setNewGraphId(final String newGraphId) {
+        this.newGraphId = newGraphId;
+    }
+
+    @Override
+    public Map<String, String> getOptions() {
+        return options;
+    }
+
+    @Override
+    public void setOptions(final Map<String, String> options) {
+        this.options = options;
+    }
+
+    @Override
+    public Operation shallowClone() throws CloneFailedException {
+        return new ChangeGraphId.Builder()
+            .graphId(graphId)
+            .newGraphId(newGraphId)
+            .options(options)
+            .build();
+    }
+
+    public static class Builder extends Operation.BaseBuilder<ChangeGraphId, Builder> {
+        public Builder() {
+            super(new ChangeGraphId());
+        }
+
+        /**
+         * Set the current graph ID
+         *
+         * @param graphId the graph ID to be changed
+         * @return the builder
+         */
+        public Builder graphId(final String graphId) {
+            _getOp().setGraphId(graphId);
+            return _self();
+        }
+
+        /**
+         * Set the new graph ID
+         *
+         * @param newGraphId the new graph ID
+         * @return the builder
+         */
+        public Builder newGraphId(final String newGraphId) {
+            _getOp().setNewGraphId(newGraphId);
+            return _self();
+        }
+    }
+}
diff --git a/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/FederatedOperationChainValidator.java b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/FederatedOperationChainValidator.java
new file mode 100644
index 00000000000..e2fc8e339c7
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/FederatedOperationChainValidator.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.federated.simple.operation;
+
+import uk.gov.gchq.gaffer.core.exception.GafferRuntimeException;
+import uk.gov.gchq.gaffer.operation.Operation;
+import uk.gov.gchq.gaffer.operation.OperationException;
+import uk.gov.gchq.gaffer.store.Context;
+import uk.gov.gchq.gaffer.store.Store;
+import uk.gov.gchq.gaffer.store.operation.GetSchema;
+import uk.gov.gchq.gaffer.store.operation.OperationChainValidator;
+import uk.gov.gchq.gaffer.store.schema.Schema;
+import uk.gov.gchq.gaffer.store.schema.ViewValidator;
+import uk.gov.gchq.gaffer.user.User;
+
+/**
+ * Extends {@link OperationChainValidator} and uses the FederatedStore to get
+ * the merged schema based on the operation options.
+ */
+public class FederatedOperationChainValidator extends OperationChainValidator {
+
+    public FederatedOperationChainValidator(final ViewValidator viewValidator) {
+        super(viewValidator);
+    }
+
+    @Override
+    protected Schema getSchema(final Operation operation, final User user, final Store store) {
+        try {
+            return store.execute(new GetSchema.Builder().options(operation.getOptions()).build(), new Context(user));
+        } catch (final OperationException e) {
+            throw new GafferRuntimeException("Unable to get merged schema for graph " + store.getGraphId(), e);
+        }
+    }
+}
diff --git a/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/GetAllGraphIds.java b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/GetAllGraphIds.java
new file mode 100644
index 00000000000..3777a9fbcad
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/GetAllGraphIds.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.federated.simple.operation;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+
+import org.apache.commons.lang3.exception.CloneFailedException;
+
+import uk.gov.gchq.gaffer.operation.Operation;
+import uk.gov.gchq.gaffer.operation.io.Output;
+import uk.gov.gchq.gaffer.operation.serialisation.TypeReferenceImpl;
+import uk.gov.gchq.koryphe.Since;
+import uk.gov.gchq.koryphe.Summary;
+
+import java.util.Map;
+import java.util.Set;
+
+@Since("2.4.0")
+@Summary("Get all the graph IDs available to a federated store")
+public class GetAllGraphIds implements Output<Set<String>> {
+
+    private Map<String, String> options;
+
+    @Override
+    public Map<String, String> getOptions() {
+        return options;
+    }
+
+    @Override
+    public void setOptions(final Map<String, String> options) {
+        this.options = options;
+    }
+
+    @Override
+    public Operation shallowClone() throws CloneFailedException {
+        return new GetAllGraphIds();
+    }
+
+    @Override
+    public TypeReference<Set<String>> getOutputTypeReference() {
+        return new TypeReferenceImpl.Set<>();
+    }
+
+    public static class Builder extends Operation.BaseBuilder<GetAllGraphIds, Builder> {
+        public Builder() {
+            super(new GetAllGraphIds());
+        }
+    }
+
+}
diff --git a/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/GetAllGraphInfo.java b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/GetAllGraphInfo.java
new file mode 100644
index 00000000000..6c107c836fa
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/GetAllGraphInfo.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.federated.simple.operation;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+
+import org.apache.commons.lang3.exception.CloneFailedException;
+
+import uk.gov.gchq.gaffer.operation.Operation;
+import uk.gov.gchq.gaffer.operation.io.Output;
+import uk.gov.gchq.gaffer.operation.serialisation.TypeReferenceImpl;
+import uk.gov.gchq.koryphe.Since;
+import uk.gov.gchq.koryphe.Summary;
+
+import java.util.Map;
+
+@Since("2.4.0")
+@Summary("Get all the graph info from graphs in a federated store")
+public class GetAllGraphInfo implements Output<Map<String, Object>> {
+
+    private Map<String, String> options;
+
+    @Override
+    public Map<String, String> getOptions() {
+       return options;
+    }
+
+    @Override
+    public void setOptions(final Map<String, String> options) {
+        this.options = options;
+    }
+
+    @Override
+    public Operation shallowClone() throws CloneFailedException {
+        return new GetAllGraphInfo();
+    }
+
+    @Override
+    public TypeReference<Map<String, Object>> getOutputTypeReference() {
+        return new TypeReferenceImpl.MapStringObject();
+    }
+
+    public static class Builder extends Operation.BaseBuilder<GetAllGraphInfo, Builder> {
+        public Builder() {
+            super(new GetAllGraphInfo());
+        }
+    }
+
+}
diff --git a/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/RemoveGraph.java b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/RemoveGraph.java
new file mode 100644
index 00000000000..cbb7b9a91d9
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/RemoveGraph.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.federated.simple.operation;
+
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+import org.apache.commons.lang3.exception.CloneFailedException;
+
+import uk.gov.gchq.gaffer.commonutil.Required;
+import uk.gov.gchq.gaffer.operation.Operation;
+import uk.gov.gchq.koryphe.Since;
+import uk.gov.gchq.koryphe.Summary;
+
+import java.util.Map;
+
+@Since("2.4.0")
+@Summary("Removes a new Graph from the federated store optionally deleting all data")
+@JsonPropertyOrder(value = { "class", "graphId" }, alphabetic = true)
+public class RemoveGraph implements Operation {
+
+    @Required
+    private String graphId;
+    private boolean deleteAllData = false;
+    private Map<String, String> options;
+
+    // Getters
+
+    /**
+     * Get the graph ID of the graph to remove.
+     *
+     * @return The graph ID.
+     */
+    public String getGraphId() {
+        return graphId;
+    }
+
+    /**
+     * Get whether to delete all the data.
+     *
+     * @return True if deleting all.
+     */
+    public boolean getDeleteAllData() {
+        return deleteAllData;
+    }
+
+    // Setters
+
+    /**
+     * Set the graph ID of the graph to remove.
+     *
+     * @param graphId The graph ID.
+     */
+    public void setGraphId(final String graphId) {
+        this.graphId = graphId;
+    }
+
+    /**
+     * Set whether to delete all data as well.
+     *
+     * @param deleteAllData Delete all.
+     */
+    public void setDeleteAllData(final boolean deleteAllData) {
+        this.deleteAllData = deleteAllData;
+    }
+
+    @Override
+    public Map<String, String> getOptions() {
+        return options;
+    }
+
+    @Override
+    public void setOptions(final Map<String, String> options) {
+        this.options = options;
+    }
+
+    @Override
+    public Operation shallowClone() throws CloneFailedException {
+        return new RemoveGraph.Builder()
+            .graphId(graphId)
+            .deleteAllData(deleteAllData)
+            .options(options)
+            .build();
+    }
+
+    public static class Builder extends Operation.BaseBuilder<RemoveGraph, Builder> {
+        public Builder() {
+            super(new RemoveGraph());
+        }
+
+        /**
+         * Set the graph ID.
+         *
+         * @param graphId The graph ID to set.
+         * @return The builder.
+         */
+        public Builder graphId(final String graphId) {
+            _getOp().setGraphId(graphId);
+            return _self();
+        }
+
+        /**
+         * Set if to delete all data from the graph.
+         *
+         * @param deleteAllData Delete all the data.
+         * @return The builder.
+         */
+        public Builder deleteAllData(final boolean deleteAllData) {
+            _getOp().setDeleteAllData(deleteAllData);
+            return _self();
+        }
+
+    }
+
+}
diff --git a/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/handler/EitherOperationHandler.java b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/handler/EitherOperationHandler.java
new file mode 100644
index 00000000000..66de41a466c
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/handler/EitherOperationHandler.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.federated.simple.operation.handler;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import uk.gov.gchq.gaffer.federated.simple.FederatedStore;
+import uk.gov.gchq.gaffer.operation.Operation;
+import uk.gov.gchq.gaffer.operation.OperationChain;
+import uk.gov.gchq.gaffer.operation.OperationException;
+import uk.gov.gchq.gaffer.store.Context;
+import uk.gov.gchq.gaffer.store.Store;
+import uk.gov.gchq.gaffer.store.operation.handler.OperationChainHandler;
+import uk.gov.gchq.gaffer.store.operation.handler.OperationHandler;
+import uk.gov.gchq.gaffer.store.operation.handler.named.AddToCacheHandler;
+
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * Custom handler for operations that could in theory target sub graphs or the
+ * federated store directly. Implements the {@link AddToCacheHandler} interface
+ * so that this can also handle operations that add named operations etc.
+ */
+public class EitherOperationHandler<O extends Operation> implements AddToCacheHandler<O> {
+    private static final Logger LOGGER = LoggerFactory.getLogger(EitherOperationHandler.class);
+
+    private final OperationHandler<O> standardHandler;
+
+    public EitherOperationHandler(final OperationHandler<O> standardHandler) {
+        this.standardHandler = standardHandler;
+    }
+
+    /**
+     * If graph IDs are in the options the operation will be handled by a
+     * {@link FederatedOperationHandler}, otherwise the original handler will be
+     * used e.g. executed on the federated store directly.
+     */
+    @Override
+    public Object doOperation(final O operation, final Context context, final Store store) throws OperationException {
+        LOGGER.debug("Checking if Operation should be handled locally or on sub graphs: {}", operation);
+
+        // Check inside operation chain for if all the operations are handled by a federated store
+        if (operation instanceof OperationChain) {
+            Set<Class<? extends Operation>> storeSpecificOps = ((FederatedStore) store).getStoreSpecificOperations();
+            List<Class<? extends Operation>> chainOps = ((OperationChain<?>) operation).flatten().stream()
+                .map(Operation::getClass)
+                .collect(Collectors.toList());
+            if (storeSpecificOps.containsAll(chainOps)) {
+                return new OperationChainHandler<>(store.getOperationChainValidator(), store.getOperationChainOptimisers())
+                    .doOperation((OperationChain<Object>) operation, context, store);
+            }
+        }
+
+        // If we have graph IDs then run as a federated operation
+        if (operation.containsOption(FederatedOperationHandler.OPT_GRAPH_IDS) ||
+                operation.containsOption(FederatedOperationHandler.OPT_SHORT_GRAPH_IDS) ||
+                operation.containsOption(FederatedOperationHandler.OPT_EXCLUDE_GRAPH_IDS) ||
+                operation.containsOption(FederatedOperationHandler.OPT_USE_DFLT_GRAPH_IDS)) {
+            LOGGER.debug("Operation has specified graph IDs, it will be handled by sub graphs");
+            return new FederatedOperationHandler<>().doOperation(operation, context, store);
+        }
+
+        // No sub graphs involved just run the handler for this operations on the federated store
+        return standardHandler.doOperation(operation, context, store);
+    }
+
+    /**
+     * We might be handling an Operation that extends {@link AddToCacheHandler}
+     * so use the default handler for the suffix.
+     */
+    @Override
+    public String getSuffixCacheName() {
+        return ((AddToCacheHandler<O>) standardHandler).getSuffixCacheName();
+    }
+}
diff --git a/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/handler/FederatedOperationHandler.java b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/handler/FederatedOperationHandler.java
new file mode 100644
index 00000000000..734fb3f7ee0
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/handler/FederatedOperationHandler.java
@@ -0,0 +1,192 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.federated.simple.operation.handler;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import uk.gov.gchq.gaffer.cache.exception.CacheOperationException;
+import uk.gov.gchq.gaffer.federated.simple.FederatedStore;
+import uk.gov.gchq.gaffer.federated.simple.access.GraphAccess;
+import uk.gov.gchq.gaffer.graph.GraphSerialisable;
+import uk.gov.gchq.gaffer.operation.Operation;
+import uk.gov.gchq.gaffer.operation.OperationException;
+import uk.gov.gchq.gaffer.operation.io.Output;
+import uk.gov.gchq.gaffer.store.Context;
+import uk.gov.gchq.gaffer.store.Store;
+import uk.gov.gchq.gaffer.store.operation.handler.OperationHandler;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+
+/**
+ * Main default handler for federated operations. Handles delegation to selected
+ * graphs and will sub class the operation to a {@link FederatedOutputHandler}
+ * if provided operation has output so that it is merged.
+ */
+public class FederatedOperationHandler<P extends Operation> implements OperationHandler<P> {
+    private static final Logger LOGGER = LoggerFactory.getLogger(FederatedOperationHandler.class);
+
+    /**
+     * The operation option for the Graph IDs that an operation should be
+     * executed on, will take preference over the short variant of this option.
+     */
+    public static final String OPT_GRAPH_IDS = "gaffer.federatedstore.operation.graphIds";
+
+    /**
+     * The short version of the operation option for the Graph IDs that an
+     * operation should be executed on.
+     */
+    public static final String OPT_SHORT_GRAPH_IDS = "federated.graphIds";
+
+    /**
+     * Graph IDs to exclude from the execution. If this option is set all graphs
+     * except the ones specified are executed on.
+     */
+    public static final String OPT_EXCLUDE_GRAPH_IDS = "federated.excludeGraphIds";
+
+    /**
+     * A boolean option to specify to use the default graph IDs. The option is
+     * not specifically required as default graph IDs will be used as a
+     * fallback, but if set the whole chain will be forwarded rather than each
+     * individual operation so can speed things up.
+     */
+    public static final String OPT_USE_DFLT_GRAPH_IDS = "federated.useDefaultGraphIds";
+
+    /**
+     * The boolean operation option to specify if element merging should be applied or not.
+     */
+    public static final String OPT_AGGREGATE_ELEMENTS = "federated.aggregateElements";
+
+    /**
+     * A boolean option to specify if a graph should be skipped if execution
+     * fails on it e.g. continue executing on the rest of the graphs
+     */
+    public static final String OPT_SKIP_FAILED_EXECUTE = "federated.skipGraphOnFail";
+
+    /**
+     * A boolean option to specify if the results from each graph should be kept
+     * separate. If set this will return a map where each key value is the graph
+     * ID and its respective result.
+     */
+    public static final String OPT_SEPARATE_RESULTS = "federated.separateResults";
+
+    @Override
+    public Object doOperation(final P operation, final Context context, final Store store) throws OperationException {
+        LOGGER.debug("Running operation: {}", operation);
+
+        // If the operation has output wrap and return using sub class handler
+        if (operation instanceof Output) {
+            // Should we keep the results separate
+            if (Boolean.parseBoolean(operation.getOption(OPT_SEPARATE_RESULTS, "false"))) {
+                return new SeparateOutputHandler<>().doOperation((Output)  operation, context, store);
+            }
+            return new FederatedOutputHandler<>().doOperation((Output) operation, context, store);
+        }
+
+        List<GraphSerialisable> graphsToExecute = getGraphsToExecuteOn(operation, context, (FederatedStore) store);
+        // No-op
+        if (graphsToExecute.isEmpty()) {
+            return null;
+        }
+
+        // Execute the operation chain on each graph
+        for (final GraphSerialisable gs : graphsToExecute) {
+            try {
+                gs.getGraph().execute(operation, context.getUser());
+            } catch (final OperationException | UnsupportedOperationException e) {
+                // Optionally skip this error if user has specified to do so
+                LOGGER.error("Operation failed on graph: {}", gs.getGraphId());
+                if (!Boolean.parseBoolean(operation.getOption(OPT_SKIP_FAILED_EXECUTE, "false"))) {
+                    throw e;
+                }
+                LOGGER.info("Continuing operation execution on sub graphs");
+            } catch (final IllegalArgumentException e) {
+                // An operation may fail validation for a sub graph this is not really an error.
+                // We can just continue to execute on the rest of the graphs
+                LOGGER.warn("Operation contained invalid arguments for a sub graph, skipped execution on graph: {}", gs.getGraphId());
+            }
+
+        }
+
+        // Assume no output, we've already checked above
+        return null;
+    }
+
+
+    /**
+     * Extract the graph IDs from the operation and process the option.
+     * Will default to the store configured graph IDs if no option present.
+     * <p>
+     * Returned list will be ordered alphabetically based on graph ID for
+     * predicability.
+     *
+     * @param operation The operation to execute.
+     * @param context The context.
+     * @param store The federated store.
+     * @return List of {@link GraphSerialisable}s to execute on.
+     * @throws OperationException Fail to get Graphs.
+     */
+    protected List<GraphSerialisable> getGraphsToExecuteOn(final Operation operation, final Context context,
+            final FederatedStore store) throws OperationException {
+        // Use default graph IDs as fallback
+        List<String> graphIds = store.getDefaultGraphIds();
+        List<GraphSerialisable> graphsToExecute = new LinkedList<>();
+        // If user specified graph IDs for this chain parse as comma separated list
+        if (operation.containsOption(OPT_GRAPH_IDS)) {
+            graphIds = Arrays.asList(operation.getOption(OPT_GRAPH_IDS).split(","));
+        } else if (operation.containsOption(OPT_SHORT_GRAPH_IDS)) {
+            graphIds = Arrays.asList(operation.getOption(OPT_SHORT_GRAPH_IDS).split(","));
+        }
+
+        // If a user has specified to just exclude some graphs then run all but them
+        if (operation.containsOption(OPT_EXCLUDE_GRAPH_IDS)) {
+            // Get all the IDs
+            graphIds = StreamSupport.stream(store.getAllGraphsAndAccess().spliterator(), false)
+                .map(Pair::getLeft)
+                .map(GraphSerialisable::getGraphId)
+                .collect(Collectors.toList());
+
+            // Exclude the ones the user has specified
+            Arrays.asList(operation.getOption(OPT_EXCLUDE_GRAPH_IDS).split(",")).forEach(graphIds::remove);
+        }
+
+        try {
+            // Get the corresponding graph serialisable
+            for (final String id : graphIds) {
+                LOGGER.debug("Will execute on Graph: {}", id);
+                Pair<GraphSerialisable, GraphAccess> pair = store.getGraphAccessPair(id);
+                // Check the user has access to the graph
+                if (pair.getRight().hasReadAccess(context.getUser(), store.getProperties().getAdminAuth())) {
+                    graphsToExecute.add(pair.getLeft());
+                }
+            }
+        } catch (final CacheOperationException e) {
+            throw new OperationException("Failed to get Graphs from cache", e);
+        }
+
+        // Keep graphs sorted so results returned are predictable between runs
+        Collections.sort(graphsToExecute, (g1, g2) -> g1.getGraphId().compareTo(g2.getGraphId()));
+
+        return graphsToExecute;
+    }
+}
diff --git a/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/handler/FederatedOutputHandler.java b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/handler/FederatedOutputHandler.java
new file mode 100644
index 00000000000..457377e7e0a
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/handler/FederatedOutputHandler.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.federated.simple.operation.handler;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import uk.gov.gchq.gaffer.federated.simple.FederatedStore;
+import uk.gov.gchq.gaffer.federated.simple.merge.DefaultResultAccumulator;
+import uk.gov.gchq.gaffer.federated.simple.merge.FederatedResultAccumulator;
+import uk.gov.gchq.gaffer.graph.GraphSerialisable;
+import uk.gov.gchq.gaffer.operation.OperationException;
+import uk.gov.gchq.gaffer.operation.io.Output;
+import uk.gov.gchq.gaffer.store.Context;
+import uk.gov.gchq.gaffer.store.Store;
+import uk.gov.gchq.gaffer.store.operation.handler.OutputOperationHandler;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+/**
+ * A sub class operation handler for federation that can process operations that have an
+ * output associated with them. Will apply a {@link FederatedResultAccumulator} to merge
+ * and reduce the results from multiple graphs into one.
+ */
+public class FederatedOutputHandler<P extends Output<O>, O>
+        extends FederatedOperationHandler<P> implements OutputOperationHandler<P, O> {
+    private static final Logger LOGGER = LoggerFactory.getLogger(FederatedOutputHandler.class);
+
+    @Override
+    public O doOperation(final P operation, final Context context, final Store store) throws OperationException {
+        List<GraphSerialisable> graphsToExecute = this.getGraphsToExecuteOn(operation, context, (FederatedStore) store);
+
+        if (graphsToExecute.isEmpty()) {
+            return null;
+        }
+
+        // Execute the operation chain on each graph
+        List<O> graphResults = new ArrayList<>();
+        for (final GraphSerialisable gs : graphsToExecute) {
+            try {
+                graphResults.add(gs.getGraph().execute(operation, context.getUser()));
+            } catch (final OperationException | UnsupportedOperationException e) {
+                // Optionally skip this error if user has specified to do so
+                LOGGER.error("Operation failed on graph: {}", gs.getGraphId());
+                if (!Boolean.parseBoolean(operation.getOption(OPT_SKIP_FAILED_EXECUTE, "false"))) {
+                    throw e;
+                }
+                LOGGER.info("Continuing operation execution on sub graphs");
+            } catch (final IllegalArgumentException e) {
+                // An operation may fail validation for a sub graph this is not really an error.
+                // We can just continue to execute on the rest of the graphs
+                LOGGER.warn("Operation contained invalid arguments for a sub graph, skipped execution on graph: {}", gs.getGraphId());
+            }
+        }
+
+        // Not expecting any output so exit since we've executed
+        if (operation.getOutputClass() == Void.class || graphResults.isEmpty()) {
+            return null;
+        }
+
+        // Merge the store props with the operation options for setting up the accumulator
+        Properties combinedProps = store.getProperties().getProperties();
+        if (operation.getOptions() != null) {
+            combinedProps.putAll(operation.getOptions());
+        }
+
+        // Set up the result accumulator
+        FederatedResultAccumulator<O> resultAccumulator = new DefaultResultAccumulator<>(combinedProps);
+        resultAccumulator.setSchema(((FederatedStore) store).getSchema(graphsToExecute));
+
+        if (operation.containsOption(OPT_AGGREGATE_ELEMENTS)) {
+            resultAccumulator.setAggregateElements(Boolean.parseBoolean(operation.getOption(OPT_AGGREGATE_ELEMENTS)));
+        }
+        // Should now have a list of <O> objects so need to reduce to just one
+        return graphResults.stream().reduce(resultAccumulator::apply).orElse(graphResults.get(0));
+    }
+
+}
diff --git a/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/handler/SeparateOutputHandler.java b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/handler/SeparateOutputHandler.java
new file mode 100644
index 00000000000..a9e9bd49479
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/handler/SeparateOutputHandler.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.federated.simple.operation.handler;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import uk.gov.gchq.gaffer.federated.simple.FederatedStore;
+import uk.gov.gchq.gaffer.graph.GraphSerialisable;
+import uk.gov.gchq.gaffer.operation.OperationException;
+import uk.gov.gchq.gaffer.operation.io.Output;
+import uk.gov.gchq.gaffer.store.Context;
+import uk.gov.gchq.gaffer.store.Store;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Handler for running federated operations but keeping the results separate
+ * under a key of the graph ID the results come from.
+ */
+public class SeparateOutputHandler<P extends Output<O>, O> extends FederatedOperationHandler<P> {
+    private static final Logger LOGGER = LoggerFactory.getLogger(SeparateOutputHandler.class);
+
+    @Override
+    public Map<String, O> doOperation(final P operation, final Context context, final Store store) throws OperationException {
+        List<GraphSerialisable> graphsToExecute = this.getGraphsToExecuteOn(operation, context, (FederatedStore) store);
+
+        if (graphsToExecute.isEmpty()) {
+            return new HashMap<>();
+        }
+
+        // Execute the operation chain on each graph
+        LOGGER.debug("Returning separated graph results");
+        Map<String, O> results = new HashMap<>();
+        for (final GraphSerialisable gs : graphsToExecute) {
+            try {
+                results.put(gs.getGraphId(), gs.getGraph().execute(operation, context.getUser()));
+            } catch (final OperationException | UnsupportedOperationException e) {
+                // Optionally skip this error if user has specified to do so
+                LOGGER.error("Operation failed on graph: {}", gs.getGraphId());
+                if (!Boolean.parseBoolean(operation.getOption(OPT_SKIP_FAILED_EXECUTE, "false"))) {
+                    throw e;
+                }
+            }
+        }
+
+        return results;
+    }
+}
diff --git a/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/handler/add/AddGraphHandler.java b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/handler/add/AddGraphHandler.java
new file mode 100644
index 00000000000..330c23e72de
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/handler/add/AddGraphHandler.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.federated.simple.operation.handler.add;
+
+import uk.gov.gchq.gaffer.federated.simple.FederatedStore;
+import uk.gov.gchq.gaffer.federated.simple.access.GraphAccess;
+import uk.gov.gchq.gaffer.federated.simple.operation.AddGraph;
+import uk.gov.gchq.gaffer.graph.GraphSerialisable;
+import uk.gov.gchq.gaffer.operation.OperationException;
+import uk.gov.gchq.gaffer.store.Context;
+import uk.gov.gchq.gaffer.store.Store;
+import uk.gov.gchq.gaffer.store.operation.handler.OperationHandler;
+
+import static uk.gov.gchq.gaffer.federated.simple.FederatedStoreProperties.PROP_ALLOW_PUBLIC_GRAPHS;
+
+public class AddGraphHandler implements OperationHandler<AddGraph> {
+
+    @Override
+    public Void doOperation(final AddGraph operation, final Context context, final Store store) throws OperationException {
+        // Create the graph serialisable from the supplied params
+        GraphSerialisable newGraph = new GraphSerialisable.Builder()
+                .config(operation.getGraphConfig())
+                .schema(operation.getSchema())
+                .properties(operation.getProperties())
+                .build();
+
+        // Init the builder with the owner if set
+        GraphAccess.Builder accessBuilder = new GraphAccess.Builder()
+            .owner(operation.getOwner() != null ? operation.getOwner() : context.getUser().getUserId());
+        // Add options to the graph access
+        if (operation.isPublic() != null) {
+            accessBuilder.isPublic(operation.isPublic());
+        }
+        if (operation.getReadPredicate() != null) {
+            accessBuilder.readAccessPredicate(operation.getReadPredicate());
+        }
+        if (operation.getWritePredicate() != null) {
+            accessBuilder.writeAccessPredicate(operation.getWritePredicate());
+        }
+        GraphAccess access = accessBuilder.build();
+
+        // Check if public graphs can be added
+        if (access.isPublic() && !Boolean.parseBoolean(store.getProperties().get(PROP_ALLOW_PUBLIC_GRAPHS, "true"))) {
+            throw new OperationException("Public graphs are not allowed to be added to this store");
+        }
+
+        // Add the graph
+        ((FederatedStore) store).addGraph(newGraph, access);
+
+        return null;
+    }
+}
diff --git a/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/handler/get/GetAllGraphIdsHandler.java b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/handler/get/GetAllGraphIdsHandler.java
new file mode 100644
index 00000000000..c6bc9b4a70f
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/handler/get/GetAllGraphIdsHandler.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.federated.simple.operation.handler.get;
+
+import org.apache.commons.lang3.tuple.Pair;
+
+import uk.gov.gchq.gaffer.federated.simple.FederatedStore;
+import uk.gov.gchq.gaffer.federated.simple.operation.GetAllGraphIds;
+import uk.gov.gchq.gaffer.graph.GraphSerialisable;
+import uk.gov.gchq.gaffer.operation.OperationException;
+import uk.gov.gchq.gaffer.store.Context;
+import uk.gov.gchq.gaffer.store.Store;
+import uk.gov.gchq.gaffer.store.operation.handler.OutputOperationHandler;
+
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+
+public class GetAllGraphIdsHandler implements OutputOperationHandler<GetAllGraphIds, Set<String>> {
+
+    @Override
+    public Set<String> doOperation(final GetAllGraphIds operation, final Context context, final Store store) throws OperationException {
+        // Get all the graphs and convert to a set of just IDs
+        return StreamSupport.stream(((FederatedStore) store).getAllGraphsAndAccess().spliterator(), false)
+            .map(Pair::getLeft)
+            .map(GraphSerialisable::getGraphId)
+            .collect(Collectors.toSet());
+    }
+}
diff --git a/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/handler/get/GetAllGraphInfoHandler.java b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/handler/get/GetAllGraphInfoHandler.java
new file mode 100644
index 00000000000..f03e6061849
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/handler/get/GetAllGraphInfoHandler.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.federated.simple.operation.handler.get;
+
+import uk.gov.gchq.gaffer.federated.simple.FederatedStore;
+import uk.gov.gchq.gaffer.federated.simple.access.GraphAccess;
+import uk.gov.gchq.gaffer.federated.simple.operation.GetAllGraphInfo;
+import uk.gov.gchq.gaffer.graph.GraphSerialisable;
+import uk.gov.gchq.gaffer.operation.OperationException;
+import uk.gov.gchq.gaffer.store.Context;
+import uk.gov.gchq.gaffer.store.Store;
+import uk.gov.gchq.gaffer.store.operation.handler.OutputOperationHandler;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Simple handler for getting information about the graphs contained in the federated store
+ */
+public class GetAllGraphInfoHandler implements OutputOperationHandler<GetAllGraphInfo, Map<String, Object>> {
+
+    public static final String DESCRIPTION = "graphDescription";
+    public static final String HOOKS = "graphHooks";
+    public static final String STORE_CLASS = "storeClass";
+    public static final String PROPERTIES = "storeProperties";
+    public static final String OP_DECLARATIONS = "operationDeclarations";
+    public static final String OWNER = "owner";
+    public static final String IS_PUBLIC = "isPublic";
+
+    @Override
+    public Map<String, Object> doOperation(final GetAllGraphInfo operation, final Context context, final Store store)
+        throws OperationException {
+            Map<String, Object> allGraphInfo = new HashMap<>();
+
+            // Get all the graphs in the federated store
+            ((FederatedStore) store).getAllGraphsAndAccess().forEach(pair -> {
+                Map<String, Object> graphInfo = new HashMap<>();
+                GraphSerialisable graph = pair.getLeft();
+                GraphAccess access = pair.getRight();
+
+                // Get the various properties of the individual federated graphs
+                graphInfo.put(DESCRIPTION, graph.getConfig().getDescription());
+                graphInfo.put(HOOKS, graph.getConfig().getHooks());
+                graphInfo.put(STORE_CLASS, graph.getStoreProperties().getStoreClass());
+                graphInfo.put(OP_DECLARATIONS, graph.getStoreProperties().getOperationDeclarations().getOperations());
+                // Get the access properties
+                graphInfo.put(OWNER, access.getOwner());
+                graphInfo.put(IS_PUBLIC, access.isPublic());
+
+                // Only add the full properties if user has write access
+                if (access.hasWriteAccess(context.getUser(), store.getProperties().getAdminAuth())) {
+                    graphInfo.put(PROPERTIES, graph.getStoreProperties().getProperties());
+                }
+
+                // Add the Graph ID and all properties associated with it
+                allGraphInfo.put(graph.getConfig().getGraphId(), graphInfo);
+            });
+
+            return allGraphInfo;
+        }
+}
diff --git a/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/handler/get/GetSchemaHandler.java b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/handler/get/GetSchemaHandler.java
new file mode 100644
index 00000000000..7f1ccc60c96
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/handler/get/GetSchemaHandler.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.federated.simple.operation.handler.get;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import uk.gov.gchq.gaffer.federated.simple.FederatedStore;
+import uk.gov.gchq.gaffer.federated.simple.operation.handler.FederatedOutputHandler;
+import uk.gov.gchq.gaffer.graph.GraphSerialisable;
+import uk.gov.gchq.gaffer.operation.OperationException;
+import uk.gov.gchq.gaffer.store.Context;
+import uk.gov.gchq.gaffer.store.Store;
+import uk.gov.gchq.gaffer.store.operation.GetSchema;
+import uk.gov.gchq.gaffer.store.schema.Schema;
+import uk.gov.gchq.gaffer.store.schema.exception.VertexSerialiserSchemaException;
+import uk.gov.gchq.gaffer.store.schema.exception.VisibilityPropertySchemaException;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Simple handler for merging schemas from multiple graphs.
+ */
+public class GetSchemaHandler extends FederatedOutputHandler<GetSchema, Schema> {
+    private static final Logger LOGGER = LoggerFactory.getLogger(GetSchemaHandler.class);
+
+    @Override
+    public Schema doOperation(final GetSchema operation, final Context context, final Store store) throws OperationException {
+        List<GraphSerialisable> graphsToExecute = this.getGraphsToExecuteOn(operation, context, (FederatedStore) store);
+
+        if (graphsToExecute.isEmpty()) {
+            return new Schema();
+        }
+
+        // Execute the operation chain on each graph
+        List<Schema> graphResults = new ArrayList<>();
+        for (final GraphSerialisable gs : graphsToExecute) {
+            graphResults.add(gs.getGraph().execute(operation, context.getUser()));
+        }
+
+        // Merge schemas using schema builder
+        boolean wipeVisabilityProperty = false;
+        boolean wipeVertexSerialiser = false;
+        Schema.Builder mergeSchema = new Schema.Builder();
+        for (final Schema schema : graphResults) {
+            try {
+                mergeSchema.merge(schema);
+            } catch (final VisibilityPropertySchemaException e) {
+                LOGGER.warn("Schema visibility properties are conflicting, continuing to merge sub graph schemas without");
+                mergeSchema.merge(new Schema.Builder(schema).visibilityProperty(null).build());
+                wipeVisabilityProperty = true;
+            } catch (final VertexSerialiserSchemaException e) {
+                LOGGER.warn("Vertex serialisers are conflicting, continuing to merge sub graph schemas without");
+                mergeSchema.merge(new Schema.Builder(schema).vertexSerialiser(null).build());
+                wipeVertexSerialiser = true;
+            }
+        }
+
+        if (wipeVisabilityProperty) {
+            mergeSchema.visibilityProperty(null);
+        }
+        if (wipeVertexSerialiser) {
+            mergeSchema.vertexSerialiser(null);
+        }
+
+        return mergeSchema.build();
+    }
+}
diff --git a/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/handler/misc/ChangeGraphIdHandler.java b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/handler/misc/ChangeGraphIdHandler.java
new file mode 100644
index 00000000000..53cbf4e08f3
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/handler/misc/ChangeGraphIdHandler.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.federated.simple.operation.handler.misc;
+
+import uk.gov.gchq.gaffer.cache.exception.CacheOperationException;
+import uk.gov.gchq.gaffer.federated.simple.FederatedStore;
+import uk.gov.gchq.gaffer.federated.simple.access.GraphAccess;
+import uk.gov.gchq.gaffer.federated.simple.operation.ChangeGraphId;
+import uk.gov.gchq.gaffer.operation.OperationException;
+import uk.gov.gchq.gaffer.store.Context;
+import uk.gov.gchq.gaffer.store.Store;
+import uk.gov.gchq.gaffer.store.StoreException;
+import uk.gov.gchq.gaffer.store.operation.handler.OperationHandler;
+
+public class ChangeGraphIdHandler implements OperationHandler<ChangeGraphId> {
+
+    @Override
+    public Object doOperation(final ChangeGraphId operation, final Context context, final Store store) throws OperationException {
+        try {
+            // Check user for write access as we're modifying the graph
+            GraphAccess access = ((FederatedStore) store).getGraphAccess(operation.getGraphId());
+            if (!access.hasWriteAccess(context.getUser(), store.getProperties().getAdminAuth())) {
+                throw new OperationException(
+                    "User: '" + context.getUser().getUserId() + "' does not have write permissions for Graph: " + operation.getGraphId());
+            }
+
+            ((FederatedStore) store).changeGraphId(operation.getGraphId(), operation.getNewGraphId());
+        } catch (final StoreException | CacheOperationException e) {
+            throw new OperationException("Error changing graph ID", e);
+        }
+
+        // Nothing to return
+        return null;
+    }
+}
diff --git a/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/handler/misc/RemoveGraphHandler.java b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/handler/misc/RemoveGraphHandler.java
new file mode 100644
index 00000000000..f7309cba5ec
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/operation/handler/misc/RemoveGraphHandler.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.federated.simple.operation.handler.misc;
+
+import uk.gov.gchq.gaffer.cache.exception.CacheOperationException;
+import uk.gov.gchq.gaffer.federated.simple.FederatedStore;
+import uk.gov.gchq.gaffer.federated.simple.access.GraphAccess;
+import uk.gov.gchq.gaffer.federated.simple.operation.RemoveGraph;
+import uk.gov.gchq.gaffer.federated.simple.operation.handler.FederatedOperationHandler;
+import uk.gov.gchq.gaffer.operation.OperationException;
+import uk.gov.gchq.gaffer.store.Context;
+import uk.gov.gchq.gaffer.store.Store;
+import uk.gov.gchq.gaffer.store.operation.DeleteAllData;
+import uk.gov.gchq.gaffer.store.operation.handler.OperationHandler;
+
+public class RemoveGraphHandler implements OperationHandler<RemoveGraph> {
+
+    @Override
+    public Object doOperation(final RemoveGraph operation, final Context context, final Store store) throws OperationException {
+        try {
+            // Check user for write access as we're modifying the graph
+            GraphAccess access = ((FederatedStore) store).getGraphAccess(operation.getGraphId());
+            if (!access.hasWriteAccess(context.getUser(), store.getProperties().getAdminAuth())) {
+                throw new OperationException(
+                    "User: '" + context.getUser().getUserId() + "' does not have write permissions for Graph: " + operation.getGraphId());
+            }
+        } catch (final CacheOperationException e) {
+            throw new OperationException(e);
+        }
+
+        // If asked to delete all data then run that operation first on the requested graph
+        if (operation.getDeleteAllData()) {
+            DeleteAllData deleteAllOp = new DeleteAllData.Builder()
+                .option(FederatedOperationHandler.OPT_GRAPH_IDS, operation.getGraphId())
+                .build();
+            store.execute(deleteAllOp, context);
+        }
+
+        // Remove the graph from the scope of the store
+        ((FederatedStore) store).removeGraph(operation.getGraphId());
+
+        // Nothing to return
+        return null;
+    }
+
+}
diff --git a/store-implementation/simple-federated-store/src/test/java/uk/gov/gchq/gaffer/federated/simple/FederatedStoreIT.java b/store-implementation/simple-federated-store/src/test/java/uk/gov/gchq/gaffer/federated/simple/FederatedStoreIT.java
new file mode 100644
index 00000000000..e38331306fc
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/test/java/uk/gov/gchq/gaffer/federated/simple/FederatedStoreIT.java
@@ -0,0 +1,454 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.federated.simple;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
+import uk.gov.gchq.gaffer.accumulostore.operation.impl.GetElementsBetweenSetsPairs;
+import uk.gov.gchq.gaffer.cache.CacheServiceLoader;
+import uk.gov.gchq.gaffer.data.element.Element;
+import uk.gov.gchq.gaffer.data.element.Entity;
+import uk.gov.gchq.gaffer.data.element.Properties;
+import uk.gov.gchq.gaffer.federated.simple.access.GraphAccess;
+import uk.gov.gchq.gaffer.federated.simple.operation.AddGraph;
+import uk.gov.gchq.gaffer.federated.simple.operation.GetAllGraphIds;
+import uk.gov.gchq.gaffer.federated.simple.operation.GetAllGraphInfo;
+import uk.gov.gchq.gaffer.federated.simple.operation.handler.FederatedOperationHandler;
+import uk.gov.gchq.gaffer.federated.simple.operation.handler.get.GetAllGraphInfoHandler;
+import uk.gov.gchq.gaffer.federated.simple.util.FederatedTestUtils;
+import uk.gov.gchq.gaffer.graph.Graph;
+import uk.gov.gchq.gaffer.graph.GraphConfig;
+import uk.gov.gchq.gaffer.mapstore.MapStoreProperties;
+import uk.gov.gchq.gaffer.named.operation.AddNamedOperation;
+import uk.gov.gchq.gaffer.named.operation.NamedOperation;
+import uk.gov.gchq.gaffer.operation.OperationChain;
+import uk.gov.gchq.gaffer.operation.OperationException;
+import uk.gov.gchq.gaffer.operation.impl.add.AddElements;
+import uk.gov.gchq.gaffer.operation.impl.get.GetAllElements;
+import uk.gov.gchq.gaffer.operation.impl.get.GetGraphCreatedTime;
+import uk.gov.gchq.gaffer.store.Context;
+import uk.gov.gchq.gaffer.store.StoreException;
+import uk.gov.gchq.gaffer.store.StoreProperties;
+import uk.gov.gchq.gaffer.store.schema.Schema;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.assertThatNoException;
+import static uk.gov.gchq.gaffer.federated.simple.util.FederatedTestUtils.StoreType;
+
+import java.util.AbstractMap.SimpleEntry;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+class FederatedStoreIT {
+
+    @AfterEach
+    void reset() {
+        CacheServiceLoader.shutdown();
+    }
+
+    @Test
+    void shouldFederateElementsByAggregation() throws StoreException, OperationException {
+        // Given
+        FederatedStore store = new FederatedStore();
+
+        final String graphId1 = "graph1";
+        final String graphId2 = "graph2";
+
+        final Graph graph1 = FederatedTestUtils.getBlankGraphWithModernSchema(this.getClass(), graphId1, StoreType.ACCUMULO);
+        final Graph graph2 = FederatedTestUtils.getBlankGraphWithModernSchema(this.getClass(), graphId2, StoreType.ACCUMULO);
+
+        final String group = "person";
+        final String vertex = "1";
+
+        // Add the same vertex to different graphs but with different properties
+        Properties graph1ElementProps = new Properties();
+        graph1ElementProps.put("name", "marko");
+        Entity graph1Entity = new Entity(group, vertex, graph1ElementProps);
+
+        Properties graph2ElementProps = new Properties();
+        graph2ElementProps.put("age", 29);
+        Entity graph2Entity = new Entity(group, vertex, graph2ElementProps);
+
+        // We expect only one entity to be returned that has merged properties
+        Properties mergedProperties = new Properties();
+        mergedProperties.putAll(graph1ElementProps);
+        mergedProperties.putAll(graph2ElementProps);
+        Entity expectedEntity = new Entity(group, vertex, mergedProperties);
+
+        // Init store and add graphs
+        store.initialise("federated", null, new StoreProperties());
+        store.execute(
+            new AddGraph.Builder()
+                .graphConfig(graph1.getConfig())
+                .schema(graph1.getSchema())
+                .properties(graph1.getStoreProperties().getProperties()).build(),
+            new Context());
+        store.execute(
+            new AddGraph.Builder()
+                .graphConfig(graph2.getConfig())
+                .schema(graph2.getSchema())
+                .properties(graph2.getStoreProperties().getProperties()).build(),
+            new Context());
+
+        // Add element operations
+        AddElements addGraph1Elements = new AddElements.Builder()
+            .input(graph1Entity)
+            .option(FederatedOperationHandler.OPT_GRAPH_IDS, graphId1)
+            .build();
+        AddElements addGraph2Elements = new AddElements.Builder()
+            .input(graph2Entity)
+            .option(FederatedOperationHandler.OPT_GRAPH_IDS, graphId2)
+            .build();
+
+        // Add data into graphs (use the handle method to widen methods that are tested)
+        store.handleOperation(addGraph1Elements, new Context());
+        store.handleOperation(addGraph2Elements, new Context());
+
+        // Run a get all on both graphs specifying that we want to merge elements
+        OperationChain<Iterable<? extends Element>> getAllElements = new OperationChain.Builder()
+            .first(new GetAllElements.Builder()
+                    .build())
+            .option(FederatedOperationHandler.OPT_GRAPH_IDS, graphId1 + "," + graphId2)
+            .option(FederatedOperationHandler.OPT_AGGREGATE_ELEMENTS, "true")
+            .build();
+
+        Iterable<? extends Element> result = store.execute(getAllElements, new Context());
+
+        // Then
+        assertThat(result).extracting(e -> (Element) e).containsOnly(expectedEntity);
+    }
+
+    @Test
+    void shouldSkipGraphOnFailureIfSet() throws StoreException, OperationException {
+        // Given
+        String graphId = "graph";
+        FederatedStore federatedStore = new FederatedStore();
+        Context context = new Context();
+
+        federatedStore.initialise("federated", null, new StoreProperties());
+        federatedStore.setDefaultGraphIds(Arrays.asList(graphId));
+
+        final AddGraph addGraph = new AddGraph.Builder()
+                .graphConfig(new GraphConfig(graphId))
+                .schema(new Schema())
+                .properties(new MapStoreProperties().getProperties())
+                .build();
+
+        // Add a graph
+        federatedStore.execute(addGraph, new Context());
+
+        // Run an operation that doesn't exist to the store check the option lets it pass
+        final GetElementsBetweenSetsPairs getOperationNoOps = new GetElementsBetweenSetsPairs();
+        final GetElementsBetweenSetsPairs getOperationWithOps = new GetElementsBetweenSetsPairs.Builder()
+            .option(FederatedOperationHandler.OPT_SKIP_FAILED_EXECUTE, "true")
+            .build();
+
+        // Then
+        assertThatExceptionOfType(UnsupportedOperationException.class)
+            .isThrownBy(() -> federatedStore.execute(getOperationNoOps, context));
+        assertThatNoException()
+            .isThrownBy(() -> federatedStore.execute(getOperationWithOps, context));
+    }
+
+    @Test
+    void shouldAllowReturningSeparateResults() throws StoreException, OperationException {
+        // Given
+        FederatedStore store = new FederatedStore();
+
+        final String graphId1 = "graph1";
+        final String graphId2 = "graph2";
+
+        final Graph graph1 = FederatedTestUtils.getBlankGraphWithModernSchema(this.getClass(), graphId1,
+                StoreType.MAP);
+        final Graph graph2 = FederatedTestUtils.getBlankGraphWithModernSchema(this.getClass(), graphId2,
+                StoreType.MAP);
+
+        final String group = "person";
+        final String vertex = "1";
+
+        // Add the same vertex to different graphs
+        Properties graph1ElementProps = new Properties();
+        graph1ElementProps.put("name", "marko");
+        Entity graph1Entity = new Entity(group, vertex, graph1ElementProps);
+
+        Properties graph2ElementProps = new Properties();
+        graph2ElementProps.put("age", 29);
+        Entity graph2Entity = new Entity(group, vertex, graph2ElementProps);
+
+        // Init store and add graphs
+        store.initialise("federated", null, new StoreProperties());
+        store.execute(
+                new AddGraph.Builder()
+                        .graphConfig(graph1.getConfig())
+                        .schema(graph1.getSchema())
+                        .properties(graph1.getStoreProperties().getProperties()).build(),
+                new Context());
+        store.execute(
+                new AddGraph.Builder()
+                        .graphConfig(graph2.getConfig())
+                        .schema(graph2.getSchema())
+                        .properties(graph2.getStoreProperties().getProperties()).build(),
+                new Context());
+
+        // Add element operations
+        AddElements addGraph1Elements = new AddElements.Builder()
+                .input(graph1Entity)
+                .option(FederatedOperationHandler.OPT_GRAPH_IDS, graphId1)
+                .build();
+        AddElements addGraph2Elements = new AddElements.Builder()
+                .input(graph2Entity)
+                .option(FederatedOperationHandler.OPT_GRAPH_IDS, graphId2)
+                .build();
+
+        // Add data into graphs
+        store.handleOperation(addGraph1Elements, new Context());
+        store.handleOperation(addGraph2Elements, new Context());
+
+        // Run a get all on both graphs specifying that we want separate results
+        OperationChain<Iterable<? extends Element>> getAllElements = new OperationChain.Builder()
+                .first(new GetAllElements.Builder()
+                        .build())
+                .option(FederatedOperationHandler.OPT_GRAPH_IDS, graphId1 + "," + graphId2)
+                .option(FederatedOperationHandler.OPT_SEPARATE_RESULTS, "true")
+                .build();
+
+        // Expect the results to be in a map instead
+        Map<String, Iterable<? extends Element>> result = (Map<String, Iterable<? extends Element>>) store.execute(getAllElements, new Context());
+
+        // Then
+        assertThat(result).containsKeys(graphId1, graphId2);
+        assertThat(result.get(graphId1)).extracting(e -> (Element) e).containsOnly(graph1Entity);
+        assertThat(result.get(graphId2)).extracting(e -> (Element) e).containsOnly(graph2Entity);
+    }
+
+    @Test
+    void shouldAddAndGetAllGraphs() throws StoreException, OperationException {
+        // Given
+        final String federatedGraphId = "federated";
+        final String graphId = "newGraph";
+
+        // AddGraph operation
+        final AddGraph addGraph = new AddGraph.Builder()
+                .graphConfig(new GraphConfig(graphId))
+                .schema(new Schema())
+                .properties(new java.util.Properties())
+                .build();
+
+        // GetAllGraphIds operation
+        final GetAllGraphIds getAllGraphIds = new GetAllGraphIds();
+
+        // When
+        final FederatedStore federatedStore = new FederatedStore();
+        federatedStore.initialise(federatedGraphId, null, new StoreProperties());
+
+        federatedStore.execute(addGraph, new Context());
+        final Set<String> graphIds = federatedStore.execute(getAllGraphIds, new Context());
+
+        assertThat(graphIds).containsExactly(graphId);
+    }
+
+    @Test
+    void shouldExecuteOnAllGraphsExceptExcludedOnes() throws StoreException, OperationException {
+        final String federatedGraphId = "federated";
+        final String graphId1 = "newGraph1";
+        final String graphId2 = "newGraph2";
+        final String graphId3 = "newGraph3";
+
+        // When
+        final FederatedStore federatedStore = new FederatedStore();
+        federatedStore.initialise(federatedGraphId, null, new StoreProperties());
+
+        // AddGraph operations
+        final AddGraph addGraph1 = new AddGraph.Builder()
+                .graphConfig(new GraphConfig(graphId1))
+                .schema(new Schema())
+                .properties(new MapStoreProperties().getProperties())
+                .build();
+        final AddGraph addGraph2 = new AddGraph.Builder()
+                .graphConfig(new GraphConfig(graphId2))
+                .schema(new Schema())
+                .properties(new MapStoreProperties().getProperties())
+                .build();
+        final AddGraph addGraph3 = new AddGraph.Builder()
+                .graphConfig(new GraphConfig(graphId3))
+                .schema(new Schema())
+                .properties(new MapStoreProperties().getProperties())
+                .build();
+
+        federatedStore.execute(addGraph1, new Context());
+        federatedStore.execute(addGraph2, new Context());
+        federatedStore.execute(addGraph3, new Context());
+
+        final GetGraphCreatedTime operation = new GetGraphCreatedTime.Builder()
+            .option(FederatedOperationHandler.OPT_EXCLUDE_GRAPH_IDS, graphId2)
+            .build();
+
+        Map<String, String> result = federatedStore.execute(operation, new Context());
+        assertThat(result).containsOnlyKeys(graphId1, graphId3);
+    }
+
+    @Test
+    void shouldGetAllGraphInfo() throws StoreException, OperationException {
+        // Given
+        FederatedStore store = new FederatedStore();
+        final String graphId1 = "graph1";
+        final Graph graph1 = FederatedTestUtils.getBlankGraphWithModernSchema(this.getClass(), graphId1, StoreType.MAP);
+        final GraphAccess access = new GraphAccess();
+
+        // Init store and add graph
+        store.initialise("federated", null, new StoreProperties());
+        store.execute(
+            new AddGraph.Builder()
+                .graphConfig(graph1.getConfig())
+                .schema(graph1.getSchema())
+                .properties(graph1.getStoreProperties().getProperties()).build(),
+            new Context());
+
+        // Map of the expected values for the graph
+        final Map<String, Object> graph1InfoExpected = Stream.of(
+                new SimpleEntry<>(GetAllGraphInfoHandler.DESCRIPTION, graph1.getDescription()),
+                new SimpleEntry<>(GetAllGraphInfoHandler.HOOKS, graph1.getConfig().getHooks()),
+                new SimpleEntry<>(GetAllGraphInfoHandler.OP_DECLARATIONS, graph1.getStoreProperties().getOperationDeclarations().getOperations()),
+                new SimpleEntry<>(GetAllGraphInfoHandler.STORE_CLASS, graph1.getStoreProperties().getStoreClass()),
+                new SimpleEntry<>(GetAllGraphInfoHandler.PROPERTIES, graph1.getStoreProperties().getProperties()),
+                new SimpleEntry<>(GetAllGraphInfoHandler.OWNER, access.getOwner()),
+                new SimpleEntry<>(GetAllGraphInfoHandler.IS_PUBLIC, access.isPublic()))
+            .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+
+        // When
+        // Run a GetAllGraphInfo operation
+        final Map<String, Object> graphInfo = store.execute(new GetAllGraphInfo(), new Context());
+
+        // Then
+        assertThat(graphInfo)
+            .extracting(g -> g.get(graphId1))
+            .usingRecursiveComparison()
+            .isEqualTo(graph1InfoExpected);
+    }
+
+    @Test
+    void shouldAddAndExecuteNamedOperationsFromFederatedCache() throws OperationException {
+        // Given
+        final String federatedGraphId = "federated";
+        final String graphId1 = "newGraph1";
+        final String namedOpName = "customOp";
+
+        // When
+        final Graph federatedGraph = new Graph.Builder()
+            .config(new GraphConfig(federatedGraphId))
+            .store(new FederatedStore())
+            .storeProperties(new FederatedStoreProperties())
+            .build();
+
+        // AddGraph operation
+        final AddGraph addGraph1 = new AddGraph.Builder()
+                .graphConfig(new GraphConfig(graphId1))
+                .schema(new Schema())
+                .properties(new MapStoreProperties().getProperties())
+                .build();
+
+        federatedGraph.execute(addGraph1, new Context());
+
+        // Add a new named operation to federated store
+        final AddNamedOperation addNamedOp = new AddNamedOperation.Builder()
+            .name(namedOpName)
+            .operationChain(new OperationChain.Builder()
+                .first(new GetGraphCreatedTime())
+                .build())
+            .build();
+
+        // It should be added to the federated cache so its available to all graphs
+        federatedGraph.execute(addNamedOp, new Context());
+
+        // Attempt to execute the named operation it should be resolved before sending to sub graphs
+        final NamedOperation<Void, Map<String, String>> runNamedOpOnSubGraph = new NamedOperation<>();
+        runNamedOpOnSubGraph.setOperationName(namedOpName);
+        runNamedOpOnSubGraph.addOption(FederatedOperationHandler.OPT_GRAPH_IDS, graphId1);
+
+        final NamedOperation<Void, Map<String, String>> runNamedOpOnFederated = new NamedOperation<>();
+        runNamedOpOnFederated.setOperationName(namedOpName);
+
+        // Make sure the named operation can be ran on sub graph or federated store directly
+        Map<String, String> subGraphResult = federatedGraph.execute(runNamedOpOnSubGraph, new Context());
+        Map<String, String> fedStoreResult = federatedGraph.execute(runNamedOpOnFederated, new Context());
+
+        // Then
+        assertThat(subGraphResult).containsOnlyKeys(graphId1);
+        assertThat(fedStoreResult).containsOnlyKeys(federatedGraphId);
+    }
+
+    @Test
+    void shouldAddAndExecuteNamedOperationsFromSubGraphCache() throws OperationException {
+        // Given
+        final String federatedGraphId = "federated";
+        final String graphId1 = "newGraph1";
+        final String namedOpName = "customOp";
+        final Context context = new Context();
+
+        // When
+        final Graph federatedGraph = new Graph.Builder()
+                .config(new GraphConfig(federatedGraphId))
+                .store(new FederatedStore())
+                .storeProperties(new FederatedStoreProperties())
+                .build();
+
+        // AddGraph operation
+        final AddGraph addGraph1 = new AddGraph.Builder()
+                .graphConfig(new GraphConfig(graphId1))
+                .schema(new Schema())
+                .properties(new MapStoreProperties().getProperties())
+                .build();
+
+        federatedGraph.execute(addGraph1, new Context());
+
+        // Add a new named operation
+        final AddNamedOperation addNamedOp = new AddNamedOperation.Builder()
+            .option(FederatedOperationHandler.OPT_GRAPH_IDS, graphId1)
+            .name(namedOpName)
+            .operationChain(new OperationChain.Builder()
+                    .first(new GetGraphCreatedTime())
+                    .build())
+            .build();
+
+        // The named op should be added to the sub graph cache only so
+        // the federated store won't be able to resolve it locally
+        federatedGraph.execute(addNamedOp, new Context());
+
+        // Attempt to execute the named operation
+        // It shouldn't be resolved before sending so only specific sub graphs can execute it
+        final NamedOperation<Void, Map<String, String>> runNamedOpOnSubGraph = new NamedOperation<>();
+        runNamedOpOnSubGraph.setOperationName(namedOpName);
+        runNamedOpOnSubGraph.addOption(FederatedOperationHandler.OPT_GRAPH_IDS, graphId1);
+
+        final NamedOperation<Void, Map<String, String>> runNamedOpOnFederated = new NamedOperation<>();
+        runNamedOpOnFederated.setOperationName(namedOpName);
+
+        Map<String, String> subGraphResult = federatedGraph.execute(runNamedOpOnSubGraph, new Context());
+
+        // Then
+        assertThat(subGraphResult).containsOnlyKeys(graphId1);
+        assertThatExceptionOfType(UnsupportedOperationException.class)
+            .isThrownBy(() -> federatedGraph.execute(runNamedOpOnFederated, context))
+            .withMessageContaining(namedOpName);
+    }
+
+}
diff --git a/store-implementation/simple-federated-store/src/test/java/uk/gov/gchq/gaffer/federated/simple/FederatedStoreTest.java b/store-implementation/simple-federated-store/src/test/java/uk/gov/gchq/gaffer/federated/simple/FederatedStoreTest.java
new file mode 100644
index 00000000000..69eca88285a
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/test/java/uk/gov/gchq/gaffer/federated/simple/FederatedStoreTest.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.federated.simple;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
+import uk.gov.gchq.gaffer.cache.CacheServiceLoader;
+import uk.gov.gchq.gaffer.cache.exception.CacheOperationException;
+import uk.gov.gchq.gaffer.federated.simple.access.GraphAccess;
+import uk.gov.gchq.gaffer.federated.simple.util.FederatedTestUtils;
+import uk.gov.gchq.gaffer.federated.simple.util.FederatedTestUtils.StoreType;
+import uk.gov.gchq.gaffer.graph.Graph;
+import uk.gov.gchq.gaffer.graph.GraphConfig;
+import uk.gov.gchq.gaffer.graph.GraphSerialisable;
+import uk.gov.gchq.gaffer.store.StoreException;
+import uk.gov.gchq.gaffer.store.StoreProperties;
+import uk.gov.gchq.gaffer.store.schema.Schema;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import static uk.gov.gchq.gaffer.federated.simple.FederatedStoreProperties.PROP_DEFAULT_GRAPH_IDS;
+
+class FederatedStoreTest {
+
+    @AfterEach
+    void reset() {
+        CacheServiceLoader.shutdown();
+    }
+
+    @Test
+    void shouldInitialiseNewStore() throws StoreException {
+        String graphId = "federated";
+        FederatedStoreProperties properties = new FederatedStoreProperties();
+        FederatedStore store = new FederatedStore();
+        store.initialise(graphId, null, properties);
+
+        assertThat(store.getGraphId()).isEqualTo(graphId);
+        assertThat(store.getProperties()).isEqualTo(properties);
+    }
+
+    @Test
+    void shouldNotSetDefaultGraphIdsIfGraphDoesNotExist() throws StoreException {
+        final String graphId = "federated";
+        final String graphId1 = "graph1";
+        final String graphId2 = "graph2";
+        FederatedStoreProperties properties = new FederatedStoreProperties();
+        // Set the defaults to graphs not available to the store
+        properties.set(PROP_DEFAULT_GRAPH_IDS, graphId1 + "," + graphId2);
+
+        FederatedStore store = new FederatedStore();
+        store.initialise(graphId, null, properties);
+
+        assertThat(store.getDefaultGraphIds()).isEmpty();
+    }
+
+    @Test
+    void shouldSetDefaultGraphIdsIfGraphsExist() throws StoreException {
+        final String graphId = "federated";
+        final String graphId1 = "graph1";
+        final String graphId2 = "graph2";
+        final FederatedStore store = new FederatedStore();
+        final FederatedStoreProperties properties = new FederatedStoreProperties();
+
+        // Set the defaults to graphs and make sure to add them
+        properties.set(PROP_DEFAULT_GRAPH_IDS, graphId1 + "," + graphId2);
+        store.initialise(graphId, null, properties);
+        store.addGraph(new GraphSerialisable(new GraphConfig(graphId1), new Schema(), new StoreProperties()),
+                new GraphAccess());
+        store.addGraph(new GraphSerialisable(new GraphConfig(graphId2), new Schema(), new StoreProperties()),
+                new GraphAccess());
+
+        assertThat(store.getDefaultGraphIds()).containsExactly(graphId1, graphId2);
+    }
+
+    @Test
+    void shouldAddAndGetGraphsViaStoreInterface() throws StoreException, CacheOperationException {
+        // Given
+        final String federatedGraphId = "federated";
+        final String graphId1 = "graph1";
+        final String graphId2 = "graph2";
+
+        final Graph graph1 = FederatedTestUtils.getBlankGraphWithModernSchema(this.getClass(), graphId1, StoreType.MAP);
+        final Graph graph2 = FederatedTestUtils.getBlankGraphWithModernSchema(this.getClass(), graphId2, StoreType.MAP);
+
+        final GraphSerialisable graph1Serialisable = new GraphSerialisable(graph1.getConfig(), graph1.getSchema(), graph1.getStoreProperties());
+        final GraphSerialisable graph2Serialisable = new GraphSerialisable(graph2.getConfig(), graph2.getSchema(), graph2.getStoreProperties());
+
+        final Graph expectedGraph1 = FederatedTestUtils.getBlankGraphWithModernSchema(this.getClass(), graphId1, StoreType.MAP);
+        final Graph expectedGraph2 = FederatedTestUtils.getBlankGraphWithModernSchema(this.getClass(), graphId2, StoreType.MAP);
+
+        // When
+        FederatedStore store = new FederatedStore();
+        store.initialise(federatedGraphId, null, new StoreProperties());
+        store.addGraph(graph1Serialisable, new GraphAccess());
+        store.addGraph(graph2Serialisable, new GraphAccess());
+
+        // Then
+        assertThat(store.getGraph(graphId1)).isEqualTo(
+            new GraphSerialisable(
+                expectedGraph1.getConfig(),
+                expectedGraph1.getSchema(),
+                expectedGraph1.getStoreProperties()));
+        assertThat(store.getGraph(graphId2)).isEqualTo(
+            new GraphSerialisable(
+                expectedGraph2.getConfig(),
+                expectedGraph2.getSchema(),
+                expectedGraph2.getStoreProperties()));
+        assertThat(store.getAllGraphsAndAccess())
+            .extracting(Pair::getLeft)
+            .containsExactlyInAnyOrder(
+                new GraphSerialisable(
+                    expectedGraph1.getConfig(),
+                    expectedGraph1.getSchema(),
+                    expectedGraph1.getStoreProperties()),
+            new GraphSerialisable(
+                expectedGraph2.getConfig(),
+                expectedGraph2.getSchema(),
+                expectedGraph2.getStoreProperties()));
+    }
+}
diff --git a/store-implementation/simple-federated-store/src/test/java/uk/gov/gchq/gaffer/federated/simple/PreDefinedFederatedStore.java b/store-implementation/simple-federated-store/src/test/java/uk/gov/gchq/gaffer/federated/simple/PreDefinedFederatedStore.java
new file mode 100644
index 00000000000..9f6dbebc39b
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/test/java/uk/gov/gchq/gaffer/federated/simple/PreDefinedFederatedStore.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.federated.simple;
+
+import uk.gov.gchq.gaffer.accumulostore.AccumuloProperties;
+import uk.gov.gchq.gaffer.cache.CacheServiceLoader;
+import uk.gov.gchq.gaffer.commonutil.StreamUtil;
+import uk.gov.gchq.gaffer.federated.simple.access.GraphAccess;
+import uk.gov.gchq.gaffer.graph.GraphConfig;
+import uk.gov.gchq.gaffer.graph.GraphSerialisable;
+import uk.gov.gchq.gaffer.store.StoreException;
+import uk.gov.gchq.gaffer.store.StoreProperties;
+import uk.gov.gchq.gaffer.store.schema.Schema;
+
+/*
+ * Federated Store with two graphs pre-added which is used in integration testing
+ * with the AbstractStoreITs. Creates two accumulo-backed graphs and adds them to a federated
+ * store.
+ */
+public class PreDefinedFederatedStore extends FederatedStore {
+    private static final AccumuloProperties STORE_PROPERTIES = AccumuloProperties.loadStoreProperties(StreamUtil.openStream(PreDefinedFederatedStore.class, "single-use-accumulo-store.properties"));
+
+    @Override
+    public void initialise(final String graphId, final Schema schema, final StoreProperties properties) throws StoreException {
+        CacheServiceLoader.shutdown();
+
+        super.initialise(graphId, schema, properties);
+
+        addGraph(new GraphSerialisable(new GraphConfig("graphA"),
+                    schema.clone(), STORE_PROPERTIES), new GraphAccess());
+
+        addGraph(new GraphSerialisable(new GraphConfig("graphB"),
+                    schema.clone(), STORE_PROPERTIES), new GraphAccess());
+    }
+}
diff --git a/store-implementation/simple-federated-store/src/test/java/uk/gov/gchq/gaffer/federated/simple/access/GraphAccessTest.java b/store-implementation/simple-federated-store/src/test/java/uk/gov/gchq/gaffer/federated/simple/access/GraphAccessTest.java
new file mode 100644
index 00000000000..17e5e4e781a
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/test/java/uk/gov/gchq/gaffer/federated/simple/access/GraphAccessTest.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.federated.simple.access;
+
+import org.junit.jupiter.api.Test;
+
+import uk.gov.gchq.gaffer.access.predicate.AccessPredicate;
+import uk.gov.gchq.gaffer.access.predicate.NoAccessPredicate;
+import uk.gov.gchq.gaffer.access.predicate.user.DefaultUserPredicate;
+import uk.gov.gchq.gaffer.federated.simple.FederatedStore;
+import uk.gov.gchq.gaffer.user.User;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class GraphAccessTest {
+
+    @Test
+    void shouldPreventNonAdminReadIfGraphIsPrivate() {
+        // Given
+        // Private graph with a non admin user
+        GraphAccess access = new GraphAccess.Builder()
+            .isPublic(false)
+            .readAccessPredicate(new NoAccessPredicate()).build();
+        User testUser = new User("test");
+
+        // Then
+        assertThat(access.hasReadAccess(testUser)).isFalse();
+        assertThat(access.hasReadAccess(testUser, "adminAuth")).isFalse();
+    }
+
+    @Test
+    void shouldAllowAdminUserToReadPrivateGraphs() {
+        // Given
+        String adminAuth = "admin";
+        // Private graph with admin user
+        GraphAccess access = new GraphAccess.Builder()
+            .isPublic(false)
+            .readAccessPredicate(new AccessPredicate(new DefaultUserPredicate(User.UNKNOWN_USER_ID, null)))
+            .build();
+        User adminUser = new User.Builder()
+            .opAuth(adminAuth)
+            .userId("adminUser").build();
+
+        // Then
+        // Pass in admin auth to check
+        assertThat(access.hasReadAccess(adminUser, adminAuth)).isTrue();
+    }
+
+    @Test
+    void shouldAllowSystemUserToReadPrivateGraphs() {
+        // Given
+        // Private graph with no read access
+        GraphAccess access = new GraphAccess.Builder()
+            .isPublic(false)
+            .readAccessPredicate(new NoAccessPredicate()).build();
+
+        // System user for federated stores
+        User systemUser = new User(FederatedStore.FEDERATED_STORE_SYSTEM_USER);
+
+        // Then
+        assertThat(access.hasReadAccess(systemUser)).isTrue();
+    }
+
+    @Test
+    void shouldAllowAnyUserToReadPublicGraphs() {
+        // Given
+        // Public graph with restricted read access predicate
+        GraphAccess access = new GraphAccess.Builder()
+            .isPublic(true)
+            .readAccessPredicate(new NoAccessPredicate()).build();
+
+        User unknownUser = new User(User.UNKNOWN_USER_ID);
+
+        // Then
+        assertThat(access.hasReadAccess(unknownUser)).isTrue();
+    }
+
+    @Test
+    void shouldPreventWritingToGraphViaPredicate() {
+        // Given
+        // Graph that does not allow writing
+        GraphAccess access = new GraphAccess.Builder()
+            .writeAccessPredicate(new NoAccessPredicate()).build();
+
+        User testUser = new User("test");
+
+        // When
+        assertThat(access.hasWriteAccess(testUser)).isFalse();
+    }
+
+
+    @Test
+    void shouldAllowSystemUserToWriteToGraphs() {
+        // Given
+        // Graph that does not allow writing
+        GraphAccess access = new GraphAccess.Builder()
+                .writeAccessPredicate(new NoAccessPredicate()).build();
+
+        // System user for federated stores
+        User systemUser = new User(FederatedStore.FEDERATED_STORE_SYSTEM_USER);
+
+        // Then
+        assertThat(access.hasWriteAccess(systemUser)).isTrue();
+    }
+
+}
diff --git a/store-implementation/simple-federated-store/src/test/java/uk/gov/gchq/gaffer/federated/simple/integration/FederatedStoreITs.java b/store-implementation/simple-federated-store/src/test/java/uk/gov/gchq/gaffer/federated/simple/integration/FederatedStoreITs.java
new file mode 100644
index 00000000000..6f1fdd35d70
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/test/java/uk/gov/gchq/gaffer/federated/simple/integration/FederatedStoreITs.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.federated.simple.integration;
+
+import org.junit.platform.suite.api.ConfigurationParameter;
+
+import uk.gov.gchq.gaffer.commonutil.StreamUtil;
+import uk.gov.gchq.gaffer.federated.simple.FederatedStoreProperties;
+import uk.gov.gchq.gaffer.integration.AbstractStoreITs;
+import uk.gov.gchq.gaffer.store.schema.Schema;
+
+import java.util.AbstractMap.SimpleEntry;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static uk.gov.gchq.gaffer.integration.junit.extensions.IntegrationTestSuiteExtension.INIT_CLASS;
+
+/*
+ * Implementation of the AbstractStoreITs with the simple federated store. This will initialise a pre-defined
+ * Federated Store which already has two accmumlo-backed graphs added to it.
+ */
+
+@ConfigurationParameter(key = INIT_CLASS, value = "uk.gov.gchq.gaffer.federated.simple.integration.FederatedStoreITs")
+public class FederatedStoreITs extends AbstractStoreITs {
+    private static final FederatedStoreProperties STORE_PROPERTIES = FederatedStoreProperties
+        .loadStoreProperties(StreamUtil.openStream(FederatedStoreITs.class, "store.properties"));
+
+    private static final Schema SCHEMA = new Schema();
+    private static final Map<String, String> TESTS_TO_SKIP = Stream.of(
+            new SimpleEntry<>("shouldGetPathsWithSimpleGraphHook_2", "GetWalksIT - investigate"),
+            new SimpleEntry<>("shouldGetEntityIds",
+                "GetAdjacentIdsIT - Results duplicated due to returning EntityIds (Iterable) which will not dedup"),
+            new SimpleEntry<>("shouldGetAllElementsWithFilterWithoutSummarisation",
+                "GetAllElementsIT - count value is duplicated, elements correct otherwise"),
+            new SimpleEntry<>("shouldImportFromFileThenCorrectlyExportToFile", "ImportExportCsvIT - Investigate further"),
+            new SimpleEntry<>("shouldRightKeyOuterJoin", "JoinIT - Missing results"),
+            new SimpleEntry<>("shouldLeftKeyInnerJoin", "JoinIT - Missing results"),
+            new SimpleEntry<>("shouldRightKeyInnerJoin", "JoinIT - Missing results"),
+            new SimpleEntry<>("shouldRightKeyFullJoin", "JoinIT - Missing results"),
+            new SimpleEntry<>("shouldLeftKeyOuterJoin", "JoinIT - Missing results"),
+            new SimpleEntry<>("shouldReturnDuplicateEdgesWhenNoAggregationIsUsed",
+                "NoAggregationIT - Need to ensure that when schema has aggregation false that this is applied"),
+            new SimpleEntry<>("shouldReturnDuplicateEntitiesWhenNoAggregationIsUsed",
+                "NoAggregationIT - Need to ensure that when schema has aggregation false that this is applied"),
+            new SimpleEntry<>("shouldAggregateOnlyRequiredGroupsWithQueryTimeAggregation", "PartAggregationIT - Investigate further"),
+            new SimpleEntry<>("shouldAggregateOnlyRequiredGroups", "PartAggregationIT - Investigate further"),
+            new SimpleEntry<>("shouldApplyPostOpAggregation", "SchemaMigrationIT - Need to apply schema aggregation choices"))
+        .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+
+    FederatedStoreITs() {
+        setSchema(SCHEMA);
+        setStoreProperties(STORE_PROPERTIES);
+        setTestsToSkip(TESTS_TO_SKIP);
+    }
+}
diff --git a/store-implementation/simple-federated-store/src/test/java/uk/gov/gchq/gaffer/federated/simple/merge/DefaultResultAccumulatorTest.java b/store-implementation/simple-federated-store/src/test/java/uk/gov/gchq/gaffer/federated/simple/merge/DefaultResultAccumulatorTest.java
new file mode 100644
index 00000000000..60cac3cc9ec
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/test/java/uk/gov/gchq/gaffer/federated/simple/merge/DefaultResultAccumulatorTest.java
@@ -0,0 +1,195 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.federated.simple.merge;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import uk.gov.gchq.gaffer.commonutil.StreamUtil;
+import uk.gov.gchq.gaffer.data.element.Entity;
+import uk.gov.gchq.gaffer.data.element.Properties;
+import uk.gov.gchq.gaffer.federated.simple.FederatedStoreProperties;
+import uk.gov.gchq.gaffer.store.schema.Schema;
+import uk.gov.gchq.koryphe.impl.binaryoperator.CollectionIntersect;
+import uk.gov.gchq.koryphe.impl.binaryoperator.Or;
+import uk.gov.gchq.koryphe.impl.binaryoperator.Product;
+import uk.gov.gchq.koryphe.impl.binaryoperator.StringConcat;
+import uk.gov.gchq.koryphe.impl.binaryoperator.StringDeduplicateConcat;
+
+import java.util.AbstractMap.SimpleEntry;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import static uk.gov.gchq.gaffer.federated.simple.FederatedStoreProperties.PROP_DEFAULT_MERGE_ELEMENTS;
+import static uk.gov.gchq.gaffer.federated.simple.FederatedStoreProperties.PROP_MERGE_CLASS_BOOLEAN;
+import static uk.gov.gchq.gaffer.federated.simple.FederatedStoreProperties.PROP_MERGE_CLASS_COLLECTION;
+import static uk.gov.gchq.gaffer.federated.simple.FederatedStoreProperties.PROP_MERGE_CLASS_MAP;
+import static uk.gov.gchq.gaffer.federated.simple.FederatedStoreProperties.PROP_MERGE_CLASS_NUMBER;
+import static uk.gov.gchq.gaffer.federated.simple.FederatedStoreProperties.PROP_MERGE_CLASS_STRING;
+
+class DefaultResultAccumulatorTest {
+
+    static Stream<Arguments> commonDataArgs() {
+        return Stream.of(
+            Arguments.of(1, 2, 3),
+            Arguments.of("s1", "s2", "s1,s2"),
+            Arguments.of(true, false, false),
+            Arguments.of(true, true, true),
+            Arguments.of(
+                new ArrayList<>(Arrays.asList("a", "b")),
+                new ArrayList<>(Arrays.asList("c", "d")),
+                Arrays.asList("a", "b", "c", "d")),
+            Arguments.of(
+                Stream.of(new SimpleEntry<String, String>("a", "b"))
+                        .collect(Collectors.toMap(SimpleEntry::getKey, SimpleEntry::getValue)),
+                Stream.of(new SimpleEntry<String, String>("a", "c"))
+                        .collect(Collectors.toMap(SimpleEntry::getKey, SimpleEntry::getValue)),
+                Stream.of(new SimpleEntry<String, String>("a", "c"))
+                        .collect(Collectors.toMap(SimpleEntry::getKey, SimpleEntry::getValue))));
+    }
+
+    static Stream<Arguments> customMergeDataArgs() {
+        return Stream.of(
+            Arguments.of(2, 3, 6),
+            Arguments.of("s1", "s1", "s1"),
+            Arguments.of(true, false, true),
+            Arguments.of(true, true, true),
+            Arguments.of(
+                new ArrayList<>(Arrays.asList("a", "c")),
+                new ArrayList<>(Arrays.asList("c", "d")),
+                Arrays.asList("c")),
+            Arguments.of(
+                Stream.of(new SimpleEntry<String, String>("a", "b"))
+                        .collect(Collectors.toMap(SimpleEntry::getKey, SimpleEntry::getValue)),
+                Stream.of(new SimpleEntry<String, String>("a", "c"))
+                        .collect(Collectors.toMap(SimpleEntry::getKey, SimpleEntry::getValue)),
+                Stream.of(new SimpleEntry<String, String>("a", "b,c"))
+                        .collect(Collectors.toMap(SimpleEntry::getKey, SimpleEntry::getValue))));
+    }
+
+    @DisplayName("Should provide default merge methods for common data types")
+    @ParameterizedTest
+    @MethodSource("commonDataArgs")
+    <T> void shouldAccumulatePrimitiveDataByDefault(T result1, T result2, T expected) {
+        FederatedResultAccumulator<T> accumulator = new DefaultResultAccumulator<>();
+        assertThat(accumulator.apply(result1, result2)).isEqualTo(expected);
+    }
+
+    @DisplayName("Should allow customising the merge operators for common data types")
+    @ParameterizedTest
+    @MethodSource("customMergeDataArgs")
+    <T> void shouldAllowCustomOperatorsForPrimitiveData(T result1, T result2, T expected) {
+        // Set properties to update the operators
+        java.util.Properties properties = new java.util.Properties();
+        properties.setProperty(PROP_MERGE_CLASS_NUMBER, Product.class.getName());
+        properties.setProperty(PROP_MERGE_CLASS_STRING, StringDeduplicateConcat.class.getName());
+        properties.setProperty(PROP_MERGE_CLASS_BOOLEAN, Or.class.getName());
+        properties.setProperty(PROP_MERGE_CLASS_COLLECTION, CollectionIntersect.class.getName());
+        properties.setProperty(PROP_MERGE_CLASS_MAP, StringConcat.class.getName());
+
+        // Init the accumulator with custom properties
+        FederatedResultAccumulator<T> accumulator = new DefaultResultAccumulator<>(properties);
+        assertThat(accumulator.apply(result1, result2)).isEqualTo(expected);
+    }
+
+    @Test
+    void shouldNotDoElementAggregationByDefault() {
+        Iterable<Entity> iter1 = () -> Arrays.asList(new Entity("person", "1")).iterator();
+        Iterable<Entity> iter2 = () -> Arrays.asList(new Entity("person", "1")).iterator();
+        Iterable<Entity> expected = () -> Arrays.asList(
+            new Entity("person", "1"),
+            new Entity("person", "1")).iterator();
+
+        FederatedResultAccumulator<Iterable<Entity>> accumulator = new DefaultResultAccumulator<>();
+        assertThat(accumulator.apply(iter1, iter2)).containsExactlyElementsOf(expected);
+    }
+
+    @Test
+    void shouldSetElementAggregationFromProperties() {
+        // Given
+        FederatedStoreProperties properties = new FederatedStoreProperties();
+        properties.set(PROP_DEFAULT_MERGE_ELEMENTS, "true");
+
+        // When/Then
+        FederatedResultAccumulator<?> accumulator = new DefaultResultAccumulator<>(properties.getProperties());
+        assertThat(accumulator.aggregateElements()).isTrue();
+    }
+
+    @Test
+    void shouldProvideElementAggregationBySchema() {
+        // Given
+        Schema schema = Schema.fromJson(StreamUtil.openStreams(this.getClass(), "/modern/schema"));
+        // Add some properties so can be sure aggregation has happened
+        Properties iter1EntityProps = new Properties();
+        iter1EntityProps.put("name", "marko");
+        Properties iter2EntityProps = new Properties();
+        iter2EntityProps.put("age", 29);
+
+        // Add the same vertex but with different properties
+        Iterable<Entity> iter1 = () -> Arrays.asList(new Entity("person", "1", iter1EntityProps)).iterator();
+        Iterable<Entity> iter2 = () -> Arrays.asList(new Entity("person", "1", iter2EntityProps)).iterator();
+
+        // We are expecting merged properties
+        Properties mergedProperties = new Properties();
+        mergedProperties.putAll(iter1EntityProps);
+        mergedProperties.putAll(iter2EntityProps);
+        Iterable<Entity> expected = () -> Arrays.asList(new Entity("person", "1", mergedProperties)).iterator();
+
+        // When
+        FederatedResultAccumulator<Iterable<Entity>> accumulator = new DefaultResultAccumulator<>();
+        accumulator.setAggregateElements(true);
+        accumulator.setSchema(schema);
+
+        // Then
+        assertThat(accumulator.apply(iter1, iter2)).containsExactlyElementsOf(expected);
+    }
+
+    @Test
+    void shouldNotAggregateDifferentElementsOfSameGroup() {
+        // Given
+        Schema schema = Schema.fromJson(StreamUtil.openStreams(this.getClass(), "/modern/schema"));
+        // Add some properties so can be sure aggregation has not happened
+        Properties iter1EntityProps = new Properties();
+        iter1EntityProps.put("name", "marko");
+        Properties iter2EntityProps = new Properties();
+        iter2EntityProps.put("name", "vadas");
+
+        // Add different vertexes from the same group
+        Entity entity1 = new Entity("person", "1", iter1EntityProps);
+        Entity entity2 = new Entity("person", "2", iter2EntityProps);
+        Iterable<Entity> iter1 = () -> Arrays.asList(entity1).iterator();
+        Iterable<Entity> iter2 = () -> Arrays.asList(entity2).iterator();
+
+        // We are just expecting chained iterable
+        Iterable<Entity> expected = () -> Arrays.asList(entity1, entity2).iterator();
+
+        // When
+        FederatedResultAccumulator<Iterable<Entity>> accumulator = new DefaultResultAccumulator<>();
+        accumulator.setAggregateElements(true);
+        accumulator.setSchema(schema);
+
+        // Then
+        assertThat(accumulator.apply(iter1, iter2)).containsExactlyElementsOf(expected);
+    }
+}
diff --git a/store-implementation/simple-federated-store/src/test/java/uk/gov/gchq/gaffer/federated/simple/operation/AddGraphTest.java b/store-implementation/simple-federated-store/src/test/java/uk/gov/gchq/gaffer/federated/simple/operation/AddGraphTest.java
new file mode 100644
index 00000000000..9c94a70b6bd
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/test/java/uk/gov/gchq/gaffer/federated/simple/operation/AddGraphTest.java
@@ -0,0 +1,244 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.federated.simple.operation;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
+import uk.gov.gchq.gaffer.access.ResourceType;
+import uk.gov.gchq.gaffer.access.predicate.AccessPredicate;
+import uk.gov.gchq.gaffer.access.predicate.UnrestrictedAccessPredicate;
+import uk.gov.gchq.gaffer.access.predicate.user.DefaultUserPredicate;
+import uk.gov.gchq.gaffer.cache.CacheServiceLoader;
+import uk.gov.gchq.gaffer.cache.exception.CacheOperationException;
+import uk.gov.gchq.gaffer.exception.SerialisationException;
+import uk.gov.gchq.gaffer.federated.simple.FederatedStore;
+import uk.gov.gchq.gaffer.federated.simple.FederatedStoreProperties;
+import uk.gov.gchq.gaffer.federated.simple.access.GraphAccess;
+import uk.gov.gchq.gaffer.graph.GraphConfig;
+import uk.gov.gchq.gaffer.graph.GraphSerialisable;
+import uk.gov.gchq.gaffer.jsonserialisation.JSONSerialiser;
+import uk.gov.gchq.gaffer.mapstore.MapStoreProperties;
+import uk.gov.gchq.gaffer.operation.OperationException;
+import uk.gov.gchq.gaffer.store.Context;
+import uk.gov.gchq.gaffer.store.StoreException;
+import uk.gov.gchq.gaffer.store.StoreProperties;
+import uk.gov.gchq.gaffer.store.schema.Schema;
+import uk.gov.gchq.gaffer.user.User;
+
+import java.util.Properties;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+
+class AddGraphTest {
+
+    @AfterEach
+    void reset() {
+        CacheServiceLoader.shutdown();
+    }
+
+    @Test
+    void shouldAddGraphUsingBuilder() throws StoreException, OperationException, CacheOperationException {
+        // Given
+        final String federatedGraphId = "federated";
+        final String graphId = "newGraph";
+
+        // Create the expected graph that should've been added
+        final GraphSerialisable expectedSerialisable = new GraphSerialisable.Builder()
+                .config(new GraphConfig(graphId))
+                .schema(new Schema())
+                .properties(new Properties())
+                .build();
+
+        // Build operation
+        final AddGraph operation = new AddGraph.Builder()
+                .graphConfig(new GraphConfig(graphId))
+                .schema(new Schema())
+                .properties(new Properties())
+                .build();
+
+        // When
+        final FederatedStore federatedStore = new FederatedStore();
+        federatedStore.initialise(federatedGraphId, null, new StoreProperties());
+
+        federatedStore.execute(operation, new Context());
+        final GraphSerialisable addedGraph = federatedStore.getGraph(graphId);
+
+        // Then
+        assertThat(addedGraph.getConfig().getGraphId())
+            .isEqualTo(expectedSerialisable.getConfig().getGraphId());
+        assertThat(addedGraph.getSchema())
+            .isEqualTo(expectedSerialisable.getSchema());
+        assertThat(addedGraph.getStoreProperties().getProperties())
+            .isEqualTo(expectedSerialisable.getStoreProperties().getProperties());
+    }
+
+    @Test
+    void shouldAddGraphUsingJSONSerialisation()
+            throws StoreException, OperationException, SerialisationException, CacheOperationException {
+        // Given
+        final String federatedGraphId = "federated";
+        final String graphId = "newGraph";
+        final StoreProperties storeProperties = new MapStoreProperties();
+        storeProperties.set("gaffer.store.class", "uk.gov.gchq.gaffer.mapstore.MapStore");
+
+        // Set up the graph we expect to be added
+        final GraphSerialisable expectedSerialisable = new GraphSerialisable(
+            new GraphConfig(graphId), null, storeProperties);
+
+        // JSON version of the operation
+        final JSONObject jsonOperation = new JSONObject()
+            .put("class", "uk.gov.gchq.gaffer.federated.simple.operation.AddGraph")
+            .put("graphConfig", new JSONObject()
+                .put("graphId", graphId))
+            .put("properties", new JSONObject()
+                .put("gaffer.store.class", "uk.gov.gchq.gaffer.mapstore.MapStore")
+                .put("gaffer.store.properties.class", "uk.gov.gchq.gaffer.mapstore.MapStoreProperties"));
+
+        final FederatedStore federatedStore = new FederatedStore();
+        federatedStore.initialise(federatedGraphId, null, new StoreProperties());
+
+        // When
+        final AddGraph operation = JSONSerialiser.deserialise(jsonOperation.toString(), AddGraph.class);
+        federatedStore.execute(operation, new Context());
+
+        final GraphSerialisable addedGraph = federatedStore.getGraph(graphId);
+
+        // Then
+        assertThat(addedGraph.getGraphId()).isEqualTo(expectedSerialisable.getGraphId());
+        assertThat(addedGraph.getSchema()).isEqualTo(expectedSerialisable.getSchema());
+        assertThat(addedGraph.getStoreProperties().getProperties())
+            .isEqualTo(expectedSerialisable.getStoreProperties().getProperties());
+    }
+
+    @Test
+    void shouldPreventAddingGraphWithoutGraphConfig() throws StoreException {
+        // Given
+        final FederatedStore federatedStore = new FederatedStore();
+        federatedStore.initialise("federated", null, new StoreProperties());
+        final Context context = new Context();
+
+        final AddGraph operation = new AddGraph.Builder()
+            .schema(new Schema())
+            .properties(new Properties())
+            .build();
+
+        // When/Then
+        assertThatExceptionOfType(IllegalArgumentException.class)
+            .isThrownBy(() ->federatedStore.execute(operation, context))
+            .withMessageContaining("graphConfig is required");
+    }
+
+    @Test
+    void shouldPreventAddingGraphsWithSameIds() throws StoreException, OperationException {
+        // Given
+        final String graphId = "graph";
+        final FederatedStore federatedStore = new FederatedStore();
+        federatedStore.initialise("federated", null, new StoreProperties());
+        final Context context = new Context();
+
+        AddGraph operation = new AddGraph.Builder()
+                .graphConfig(new GraphConfig(graphId))
+                .schema(new Schema())
+                .properties(new Properties())
+                .build();
+
+        // Add same graph twice expect fail second time
+        federatedStore.execute(operation, context);
+
+        // Then
+        assertThatExceptionOfType(IllegalArgumentException.class)
+                .isThrownBy(() -> federatedStore.execute(operation, context))
+                .withMessageContaining("already been added to this store");
+    }
+
+    @Test
+    void shouldAddGraphWithAccessUsingJSONSerialisation()
+            throws StoreException, OperationException, SerialisationException, CacheOperationException {
+        // Given
+        final String federatedGraphId = "federated";
+        final String graphId = "newGraph";
+        final StoreProperties storeProperties = new MapStoreProperties();
+        storeProperties.set("gaffer.store.class", "uk.gov.gchq.gaffer.mapstore.MapStore");
+
+        // JSON version of the operation
+        final JSONObject jsonOperation = new JSONObject()
+                .put("class", "uk.gov.gchq.gaffer.federated.simple.operation.AddGraph")
+                .put("graphConfig", new JSONObject()
+                        .put("graphId", graphId))
+                .put("properties", new JSONObject()
+                        .put("gaffer.store.class", "uk.gov.gchq.gaffer.mapstore.MapStore")
+                        .put("gaffer.store.properties.class", "uk.gov.gchq.gaffer.mapstore.MapStoreProperties"))
+                .put("owner", User.UNKNOWN_USER_ID)
+                .put("isPublic", true)
+                .put("readPredicate", new JSONObject()
+                    .put("class", "uk.gov.gchq.gaffer.access.predicate.AccessPredicate")
+                    .put("userPredicate", new JSONObject()
+                        .put("class", "uk.gov.gchq.gaffer.access.predicate.user.DefaultUserPredicate")
+                        .put("auths", new JSONArray()
+                            .put("test"))));
+
+        final FederatedStore federatedStore = new FederatedStore();
+        federatedStore.initialise(federatedGraphId, null, new StoreProperties());
+
+        // When
+        final AddGraph operation = JSONSerialiser.deserialise(jsonOperation.toString(), AddGraph.class);
+        System.out.print(operation.getReadPredicate());
+        federatedStore.execute(operation, new Context());
+
+        final GraphAccess addedAccess = federatedStore.getGraphAccess(graphId);
+
+        // Then
+        // Check the access that was added
+        assertThat(addedAccess.getOwner()).isEqualTo(User.UNKNOWN_USER_ID);
+        assertThat(addedAccess.isPublic()).isTrue();
+        assertThat(addedAccess.getResourceType()).isEqualTo(ResourceType.FederatedStoreGraph);
+        assertThat(addedAccess.getReadAccessPredicate())
+            .isExactlyInstanceOf(AccessPredicate.class);
+        assertThat(addedAccess.getReadAccessPredicate().getUserPredicate())
+            .isExactlyInstanceOf(DefaultUserPredicate.class);
+        assertThat(addedAccess.getWriteAccessPredicate())
+            .isExactlyInstanceOf(UnrestrictedAccessPredicate.class);
+    }
+
+    @Test
+    void shouldPreventAddingPublicGraphsToStoresThatDoNotAllowIt() throws StoreException {
+        final String graphId = "graph";
+        final String federatedGraphId = "federated";
+        final FederatedStore federatedStore = new FederatedStore();
+        FederatedStoreProperties properties = new FederatedStoreProperties();
+        properties.set(FederatedStoreProperties.PROP_ALLOW_PUBLIC_GRAPHS, "false");
+
+        federatedStore.initialise(federatedGraphId, null, properties);
+
+        // Build operation
+        final AddGraph operation = new AddGraph.Builder()
+                .graphConfig(new GraphConfig(graphId))
+                .schema(new Schema())
+                .properties(new Properties())
+                .isPublic(true)
+                .build();
+
+        assertThatExceptionOfType(OperationException.class)
+            .isThrownBy(() -> federatedStore.execute(operation, new Context()))
+            .withMessageContaining("Public graphs are not allowed");
+    }
+
+}
diff --git a/store-implementation/simple-federated-store/src/test/java/uk/gov/gchq/gaffer/federated/simple/operation/ChangeGraphIdTest.java b/store-implementation/simple-federated-store/src/test/java/uk/gov/gchq/gaffer/federated/simple/operation/ChangeGraphIdTest.java
new file mode 100644
index 00000000000..773b667d7d7
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/test/java/uk/gov/gchq/gaffer/federated/simple/operation/ChangeGraphIdTest.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.federated.simple.operation;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+
+import uk.gov.gchq.gaffer.access.predicate.NoAccessPredicate;
+import uk.gov.gchq.gaffer.cache.CacheServiceLoader;
+import uk.gov.gchq.gaffer.cache.exception.CacheOperationException;
+import uk.gov.gchq.gaffer.data.element.Element;
+import uk.gov.gchq.gaffer.data.element.Entity;
+import uk.gov.gchq.gaffer.data.element.Properties;
+import uk.gov.gchq.gaffer.federated.simple.FederatedStore;
+import uk.gov.gchq.gaffer.federated.simple.operation.handler.FederatedOperationHandler;
+import uk.gov.gchq.gaffer.federated.simple.util.FederatedTestUtils;
+import uk.gov.gchq.gaffer.graph.Graph;
+import uk.gov.gchq.gaffer.graph.GraphConfig;
+import uk.gov.gchq.gaffer.graph.GraphSerialisable;
+import uk.gov.gchq.gaffer.operation.OperationChain;
+import uk.gov.gchq.gaffer.operation.OperationException;
+import uk.gov.gchq.gaffer.operation.impl.get.GetAllElements;
+import uk.gov.gchq.gaffer.store.Context;
+import uk.gov.gchq.gaffer.store.StoreException;
+import uk.gov.gchq.gaffer.store.StoreProperties;
+import uk.gov.gchq.gaffer.store.schema.Schema;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+
+import static uk.gov.gchq.gaffer.federated.simple.util.FederatedTestUtils.StoreType;
+
+class ChangeGraphIdTest {
+    private static final String FED_STORE_ID = "federated";
+    private static final String NEW_GRAPH_ID = "newGraphId";
+    private static final String GRAPH_ID_ERROR = "Graph with Graph ID: %s is not available to this federated store";
+
+    @AfterEach
+    void reset() {
+        CacheServiceLoader.shutdown();
+    }
+
+    @ParameterizedTest
+    @EnumSource(StoreType.class)
+    void shouldChangeGraphIdAndPreserveData(StoreType store) throws StoreException, OperationException, CacheOperationException {
+        // Given
+        final String graphId = "shouldChangeGraphIdAndPreserveData";
+        final Graph originalGraph = FederatedTestUtils.getBlankGraphWithModernSchema(this.getClass(), graphId, store);
+
+        // Elements to add to the graph
+        final Properties graphEntityProps = new Properties();
+        graphEntityProps.put("name", "marko");
+        final Entity graphEntity = new Entity("person", "1", graphEntityProps);
+
+        // When
+        final FederatedStore federatedStore = new FederatedStore();
+        federatedStore.initialise(FED_STORE_ID, null, new StoreProperties());
+        // Add elements to the graph
+        FederatedTestUtils.addGraphWithElements(federatedStore, originalGraph, graphEntity);
+        GraphSerialisable expectedGraphSerialisable = federatedStore.getGraph(graphId);
+
+        // Change graph ID operation
+        final ChangeGraphId changeGraphId = new ChangeGraphId.Builder()
+            .graphId(graphId)
+            .newGraphId(NEW_GRAPH_ID)
+            .build();
+        federatedStore.execute(changeGraphId, new Context());
+
+        // Check that the config + properties remains the same
+        assertThat(federatedStore.getGraph(NEW_GRAPH_ID))
+            .satisfies(gs -> {
+                assertThat(gs.getConfig())
+                    .usingRecursiveComparison()
+                    .ignoringFields("graphId")
+                    .isEqualTo(expectedGraphSerialisable.getConfig());
+
+                assertThat(gs.getStoreProperties())
+                    .isEqualTo(expectedGraphSerialisable.getStoreProperties());
+            });
+
+        // Ensure that there are no references to the 'old' graph ID
+        assertThatExceptionOfType(IllegalArgumentException.class)
+            .isThrownBy(() -> federatedStore.getGraph(graphId))
+            .withMessage(String.format(GRAPH_ID_ERROR, graphId));
+
+        // See if the graph data still exists in the cluster
+        OperationChain<Iterable<? extends Element>> getAllElements = new OperationChain.Builder()
+            .first(new GetAllElements.Builder()
+                    .build())
+            .option(FederatedOperationHandler.OPT_GRAPH_IDS, NEW_GRAPH_ID)
+            .build();
+        Iterable<? extends Element> resultGetAll = federatedStore.execute(getAllElements, new Context());
+
+        assertThat(resultGetAll).extracting(e -> (Element) e).containsExactly(graphEntity);
+    }
+
+    @Test
+    void shouldThrowErrorChangingIdIfGraphDoesntExist() throws StoreException {
+        // Given
+        final String graphId = "shouldThrowErrorChangingIdIfGraphDoesntExist";
+        final ChangeGraphId changeGraphId = new ChangeGraphId.Builder()
+            .graphId(graphId)
+            .newGraphId(NEW_GRAPH_ID)
+            .build();
+        final Context context = new Context();
+
+        // When
+        final FederatedStore federatedStore = new FederatedStore();
+        federatedStore.initialise(FED_STORE_ID, null, new StoreProperties());
+
+        assertThatExceptionOfType(IllegalArgumentException.class)
+                .isThrownBy(() -> federatedStore.execute(changeGraphId, context))
+                .withMessageContaining(String.format(GRAPH_ID_ERROR, graphId));
+    }
+
+    @Test
+    void shouldNotChangeIdOfAccessControlledGraph() throws StoreException, OperationException {
+        final String federatedGraphId = "federated";
+        final String graphId = "shouldNotChangeIdOfAccessControlledGraph";
+
+        final FederatedStore federatedStore = new FederatedStore();
+        federatedStore.initialise(federatedGraphId, null, new StoreProperties());
+
+        // Add a graph that no one can edit
+        final AddGraph addGraph = new AddGraph.Builder()
+                .graphConfig(new GraphConfig(graphId))
+                .schema(new Schema())
+                .properties(new StoreProperties().getProperties())
+                .writePredicate(new NoAccessPredicate())
+                .build();
+
+        final ChangeGraphId changeGraphId = new ChangeGraphId.Builder()
+            .graphId(graphId)
+            .newGraphId("dontDoThis")
+            .build();
+
+        // When
+        federatedStore.execute(addGraph, new Context());
+
+        // Then
+        assertThatExceptionOfType(OperationException.class)
+                .isThrownBy(() -> federatedStore.execute(changeGraphId, new Context()))
+                .withMessageContaining("does not have write permissions");
+    }
+}
diff --git a/store-implementation/simple-federated-store/src/test/java/uk/gov/gchq/gaffer/federated/simple/operation/FederatedOperationChainValidatorTest.java b/store-implementation/simple-federated-store/src/test/java/uk/gov/gchq/gaffer/federated/simple/operation/FederatedOperationChainValidatorTest.java
new file mode 100644
index 00000000000..54b783d9d6a
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/test/java/uk/gov/gchq/gaffer/federated/simple/operation/FederatedOperationChainValidatorTest.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.federated.simple.operation;
+
+import org.junit.jupiter.api.Test;
+
+import uk.gov.gchq.gaffer.core.exception.GafferRuntimeException;
+import uk.gov.gchq.gaffer.federated.simple.FederatedStore;
+import uk.gov.gchq.gaffer.operation.Operation;
+import uk.gov.gchq.gaffer.operation.OperationException;
+import uk.gov.gchq.gaffer.store.Context;
+import uk.gov.gchq.gaffer.store.operation.GetSchema;
+import uk.gov.gchq.gaffer.store.schema.Schema;
+import uk.gov.gchq.gaffer.store.schema.ViewValidator;
+import uk.gov.gchq.gaffer.user.User;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+class FederatedOperationChainValidatorTest {
+    final ViewValidator viewValidator = mock(ViewValidator.class);
+    final FederatedOperationChainValidator validator = new FederatedOperationChainValidator(viewValidator);
+    final FederatedStore store = mock(FederatedStore.class);
+    final User user = mock(User.class);
+    final Operation op = mock(Operation.class);
+    final Schema schema = mock(Schema.class);
+
+    @Test
+    void shouldGetMergedSchema() throws OperationException {
+        // Given
+        when(store.execute(any(GetSchema.class), any(Context.class))).thenReturn(schema);
+
+        // When
+        final Schema result = validator.getSchema(op, user, store);
+
+        verify(store).execute(any(GetSchema.class), any(Context.class));
+        // Then
+        assertThat(result).isEqualTo(schema);
+    }
+
+    @Test
+    void shouldThrowException() throws OperationException {
+        // Given
+        when(store.execute(any(GetSchema.class), any(Context.class))).thenThrow(GafferRuntimeException.class);
+
+        // When/Then
+        try {
+            validator.getSchema(op, user, store);
+            fail("Exception expected");
+        } catch (final Exception e) {
+            verify(store).execute(any(GetSchema.class), any(Context.class));
+            assertThat(e).isInstanceOf(GafferRuntimeException.class);
+        }
+    }
+}
diff --git a/store-implementation/simple-federated-store/src/test/java/uk/gov/gchq/gaffer/federated/simple/operation/GetSchemaTest.java b/store-implementation/simple-federated-store/src/test/java/uk/gov/gchq/gaffer/federated/simple/operation/GetSchemaTest.java
new file mode 100644
index 00000000000..238ddb2f9b9
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/test/java/uk/gov/gchq/gaffer/federated/simple/operation/GetSchemaTest.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.federated.simple.operation;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
+import uk.gov.gchq.gaffer.cache.CacheServiceLoader;
+import uk.gov.gchq.gaffer.federated.simple.FederatedStore;
+import uk.gov.gchq.gaffer.federated.simple.FederatedStoreProperties;
+import uk.gov.gchq.gaffer.federated.simple.access.GraphAccess;
+import uk.gov.gchq.gaffer.federated.simple.operation.handler.FederatedOperationHandler;
+import uk.gov.gchq.gaffer.graph.GraphConfig;
+import uk.gov.gchq.gaffer.graph.GraphSerialisable;
+import uk.gov.gchq.gaffer.mapstore.MapStoreProperties;
+import uk.gov.gchq.gaffer.operation.OperationException;
+import uk.gov.gchq.gaffer.serialisation.implementation.BooleanSerialiser;
+import uk.gov.gchq.gaffer.serialisation.implementation.BytesSerialiser;
+import uk.gov.gchq.gaffer.store.Context;
+import uk.gov.gchq.gaffer.store.StoreException;
+import uk.gov.gchq.gaffer.store.operation.GetSchema;
+import uk.gov.gchq.gaffer.store.schema.Schema;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class GetSchemaTest {
+
+    @AfterEach
+    void reset() {
+        CacheServiceLoader.shutdown();
+    }
+
+    @Test
+    void shouldMergeSchemasWithConflictingVisibilities() throws StoreException, OperationException {
+        // Define schemas with different visibility properties
+        Schema schema1 = new Schema.Builder()
+            .visibilityProperty("schema1").build();
+
+        Schema schema2 = new Schema.Builder()
+                .visibilityProperty("schema2").build();
+
+        String graphId1 = "graph1";
+        String graphId2 = "graph2";
+
+        FederatedStore federatedStore = new FederatedStore();
+        federatedStore.initialise("federated", null, new FederatedStoreProperties());
+
+        federatedStore.addGraph(
+            new GraphSerialisable(new GraphConfig(graphId1), schema1, new MapStoreProperties()),
+            new GraphAccess());
+        federatedStore.addGraph(
+            new GraphSerialisable(new GraphConfig(graphId2), schema2, new MapStoreProperties()),
+            new GraphAccess());
+
+        GetSchema getOp = new GetSchema.Builder()
+            .option(FederatedOperationHandler.OPT_GRAPH_IDS, graphId1 + "," + graphId2)
+            .build();
+
+        Schema result = federatedStore.execute(getOp, new Context());
+
+        assertThat(result).isNotNull();
+        assertThat(result.getVisibilityProperty()).isNull();
+    }
+
+    @Test
+    void shouldMergeSchemasWithConflictingSerialisers() throws StoreException, OperationException {
+        // Define schemas with different visibility properties
+        Schema schema1 = new Schema.Builder()
+                .vertexSerialiser(new BytesSerialiser()).build();
+
+        Schema schema2 = new Schema.Builder()
+                .vertexSerialiser(new BooleanSerialiser()).build();
+
+        String graphId1 = "graph1";
+        String graphId2 = "graph2";
+
+        FederatedStore federatedStore = new FederatedStore();
+        federatedStore.initialise("federated", null, new FederatedStoreProperties());
+
+        federatedStore.addGraph(
+                new GraphSerialisable(new GraphConfig(graphId1), schema1, new MapStoreProperties()),
+                new GraphAccess());
+        federatedStore.addGraph(
+                new GraphSerialisable(new GraphConfig(graphId2), schema2, new MapStoreProperties()),
+                new GraphAccess());
+
+        GetSchema getOp = new GetSchema.Builder()
+                .option(FederatedOperationHandler.OPT_GRAPH_IDS, graphId1 + "," + graphId2)
+                .build();
+
+        Schema result = federatedStore.execute(getOp, new Context());
+
+        assertThat(result).isNotNull();
+        assertThat(result.getVertexSerialiser()).isNull();
+    }
+
+}
diff --git a/store-implementation/simple-federated-store/src/test/java/uk/gov/gchq/gaffer/federated/simple/operation/RemoveGraphTest.java b/store-implementation/simple-federated-store/src/test/java/uk/gov/gchq/gaffer/federated/simple/operation/RemoveGraphTest.java
new file mode 100644
index 00000000000..76a7ced0b5c
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/test/java/uk/gov/gchq/gaffer/federated/simple/operation/RemoveGraphTest.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.federated.simple.operation;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
+import uk.gov.gchq.gaffer.access.predicate.NoAccessPredicate;
+import uk.gov.gchq.gaffer.cache.CacheServiceLoader;
+import uk.gov.gchq.gaffer.data.element.Element;
+import uk.gov.gchq.gaffer.data.element.Entity;
+import uk.gov.gchq.gaffer.data.element.Properties;
+import uk.gov.gchq.gaffer.federated.simple.FederatedStore;
+import uk.gov.gchq.gaffer.federated.simple.util.FederatedTestUtils;
+import uk.gov.gchq.gaffer.federated.simple.util.FederatedTestUtils.StoreType;
+import uk.gov.gchq.gaffer.graph.Graph;
+import uk.gov.gchq.gaffer.graph.GraphConfig;
+import uk.gov.gchq.gaffer.operation.OperationException;
+import uk.gov.gchq.gaffer.operation.impl.get.GetAllElements;
+import uk.gov.gchq.gaffer.store.Context;
+import uk.gov.gchq.gaffer.store.StoreException;
+import uk.gov.gchq.gaffer.store.StoreProperties;
+import uk.gov.gchq.gaffer.store.schema.Schema;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+
+class RemoveGraphTest {
+
+    @AfterEach
+    void reset() {
+        CacheServiceLoader.shutdown();
+    }
+
+    @Test
+    void shouldRemoveGraphAndPreserveData() throws StoreException, OperationException {
+        // Given
+        final String federatedGraphId = "federated";
+        final String graphId = "shouldRemoveGraphAndPreserveData";
+        final Graph originalGraph = FederatedTestUtils.getBlankGraphWithModernSchema(this.getClass(), graphId, StoreType.ACCUMULO);
+
+        // Entity so we can check data still exists
+        final Properties graphEntityProps = new Properties();
+        graphEntityProps.put("name", "marko");
+        final Entity graphEntity = new Entity("person", "1", graphEntityProps);
+
+        // Remove graph operation
+        final RemoveGraph removeGraph = new RemoveGraph.Builder()
+            .graphId(graphId)
+            .build();
+
+        // When
+        final FederatedStore federatedStore = new FederatedStore();
+        federatedStore.initialise(federatedGraphId, null, new StoreProperties());
+
+        // Add the graph and its elements then remove it
+        FederatedTestUtils.addGraphWithElements(federatedStore, originalGraph, graphEntity);
+        federatedStore.execute(removeGraph, new Context());
+
+        assertThatExceptionOfType(IllegalArgumentException.class)
+            .isThrownBy(() -> federatedStore.getGraph(graphId))
+            .withMessageContaining("not available to this federated store");
+
+        // See if the graph  data still exists in the cluster
+        Iterable<? extends Element> result = originalGraph.execute(new GetAllElements(), new Context());
+        assertThat(result).extracting(e -> (Element) e).containsExactly(graphEntity);
+    }
+
+    @Test
+    void shouldRemoveGraphAndDeleteAllData() throws StoreException, OperationException {
+        // Given
+        final String federatedGraphId = "federated";
+        final String graphId = "shouldRemoveGraphAndDeleteAllData";
+        final Graph originalGraph = FederatedTestUtils.getBlankGraphWithModernSchema(this.getClass(), graphId, StoreType.ACCUMULO);
+
+        // Entity so we can check data still exists
+        final Properties graphEntityProps = new Properties();
+        graphEntityProps.put("name", "marko");
+        final Entity graphEntity = new Entity("person", "1", graphEntityProps);
+
+        // Remove graph operation with delete all option set
+        final RemoveGraph removeGraph = new RemoveGraph.Builder()
+                .graphId(graphId)
+                .deleteAllData(true)
+                .build();
+
+        // When
+        final FederatedStore federatedStore = new FederatedStore();
+        federatedStore.initialise(federatedGraphId, null, new StoreProperties());
+
+        // Add the graph and its elements then remove it
+        FederatedTestUtils.addGraphWithElements(federatedStore, originalGraph, graphEntity);
+        federatedStore.execute(removeGraph, new Context());
+
+        assertThatExceptionOfType(IllegalArgumentException.class)
+                .isThrownBy(() -> federatedStore.getGraph(graphId))
+                .withMessageContaining("not available to this federated store");
+
+        // See if the graph data still exists in the cluster
+        Iterable<? extends Element> result = originalGraph.execute(new GetAllElements(), new Context());
+        assertThat(result).isEmpty();
+    }
+
+    @Test
+    void shouldNotRemoveGraphThatDoesntExist() throws StoreException {
+        // Given
+        final String federatedGraphId = "federated";
+        final String graphId = "shouldNotRemoveGraphThatDoesntExist";
+        final RemoveGraph removeGraph = new RemoveGraph.Builder()
+                .graphId(graphId)
+                .build();
+        final Context context = new Context();
+
+        // When
+        final FederatedStore federatedStore = new FederatedStore();
+        federatedStore.initialise(federatedGraphId, null, new StoreProperties());
+
+        assertThatExceptionOfType(IllegalArgumentException.class)
+                .isThrownBy(() -> federatedStore.execute(removeGraph, context))
+                .withMessageContaining("not available to this federated store");
+    }
+
+    @Test
+    void shouldNotRemoveAccessControlledGraph() throws StoreException, OperationException {
+        final String federatedGraphId = "federated";
+        final String graphId = "shouldNotRemoveAccessControlledGraph";
+
+        final FederatedStore federatedStore = new FederatedStore();
+        federatedStore.initialise(federatedGraphId, null, new StoreProperties());
+
+        // Add a graph that no one can edit
+        final AddGraph addGraph = new AddGraph.Builder()
+                .graphConfig(new GraphConfig(graphId))
+                .schema(new Schema())
+                .properties(new StoreProperties().getProperties())
+                .writePredicate(new NoAccessPredicate())
+                .build();
+
+        // Remove operation
+        final RemoveGraph removeGraph = new RemoveGraph.Builder()
+                .graphId(graphId)
+                .build();
+
+        // When
+        federatedStore.execute(addGraph, new Context());
+
+        // Then
+        assertThatExceptionOfType(OperationException.class)
+            .isThrownBy(() -> federatedStore.execute(removeGraph, new Context()))
+            .withMessageContaining("does not have write permissions");
+    }
+}
diff --git a/store-implementation/simple-federated-store/src/test/java/uk/gov/gchq/gaffer/federated/simple/util/FederatedTestUtils.java b/store-implementation/simple-federated-store/src/test/java/uk/gov/gchq/gaffer/federated/simple/util/FederatedTestUtils.java
new file mode 100644
index 00000000000..1d36ea162a4
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/test/java/uk/gov/gchq/gaffer/federated/simple/util/FederatedTestUtils.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.gchq.gaffer.federated.simple.util;
+
+import uk.gov.gchq.gaffer.accumulostore.AccumuloProperties;
+import uk.gov.gchq.gaffer.commonutil.StreamUtil;
+import uk.gov.gchq.gaffer.data.element.Element;
+import uk.gov.gchq.gaffer.federated.simple.FederatedStore;
+import uk.gov.gchq.gaffer.federated.simple.operation.AddGraph;
+import uk.gov.gchq.gaffer.federated.simple.operation.handler.FederatedOperationHandler;
+import uk.gov.gchq.gaffer.graph.Graph;
+import uk.gov.gchq.gaffer.graph.GraphConfig;
+import uk.gov.gchq.gaffer.mapstore.MapStoreProperties;
+import uk.gov.gchq.gaffer.operation.OperationException;
+import uk.gov.gchq.gaffer.operation.impl.add.AddElements;
+import uk.gov.gchq.gaffer.store.Context;
+import uk.gov.gchq.gaffer.store.StoreProperties;
+
+public final class FederatedTestUtils {
+
+    private FederatedTestUtils() {
+        // utility class
+    }
+
+    public static final MapStoreProperties MAP_STORE_PROPERTIES = MapStoreProperties
+        .loadStoreProperties("/map-store.properties");
+    public static final AccumuloProperties ACCUMULO_STORE_PROPERTIES = AccumuloProperties
+        .loadStoreProperties("/accumulo-store.properties");
+
+    public static Graph getBlankGraphWithModernSchema(Class<?> clazz, String graphId, StoreType storeType) {
+        return new Graph.Builder()
+            .config(new GraphConfig.Builder()
+                    .graphId(graphId)
+                    .description("Graph using the modern dataset")
+                    .build())
+            .storeProperties(getStoreProperties(storeType))
+            .addSchemas(StreamUtil.openStreams(clazz, "/modern/schema"))
+            .build();
+    }
+
+    /**
+     * Available store types for sub graphs
+     */
+    public enum StoreType {
+        MAP, ACCUMULO;
+    }
+
+    public static StoreProperties getStoreProperties(StoreType storeType) {
+        switch (storeType) {
+            case MAP:
+                return MAP_STORE_PROPERTIES;
+            case ACCUMULO:
+                return ACCUMULO_STORE_PROPERTIES;
+            default:
+                throw new IllegalArgumentException("Unknown StoreType: " + storeType);
+        }
+    }
+
+    /**
+     * Adds a given graph and elements to a federated store.
+     *
+     * @param store The federated store
+     * @param graph The graph to add
+     * @param elements The elements to add to the graph
+     *
+     * @throws OperationException If fails
+     */
+    public static void addGraphWithElements(FederatedStore store, Graph graph, Element... elements) throws OperationException {
+        // Add Graph operation
+        final AddGraph addGraph = new AddGraph.Builder()
+                .graphConfig(graph.getConfig())
+                .schema(graph.getSchema())
+                .properties(graph.getStoreProperties().getProperties())
+                .build();
+
+        // Add the graph
+        store.execute(addGraph, new Context());
+
+        // Add elements if required
+        if (elements.length > 0) {
+            final AddElements addGraphElements = new AddElements.Builder()
+                    .input(elements)
+                    .option(FederatedOperationHandler.OPT_GRAPH_IDS, graph.getGraphId())
+                    .build();
+
+            store.execute(addGraphElements, new Context());
+        }
+
+    }
+}
diff --git a/store-implementation/simple-federated-store/src/test/resources/accumulo-store.properties b/store-implementation/simple-federated-store/src/test/resources/accumulo-store.properties
new file mode 100644
index 00000000000..56586f0c370
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/test/resources/accumulo-store.properties
@@ -0,0 +1,21 @@
+#
+# Copyright 2024 Crown Copyright
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+gaffer.store.class=uk.gov.gchq.gaffer.accumulostore.MiniAccumuloStore
+accumulo.instance=federatedTestInstance
+accumulo.zookeepers=localhost
+accumulo.user=user01
+accumulo.password=password
+accumulo.mini.visibilities=auth1,auth2
diff --git a/store-implementation/simple-federated-store/src/test/resources/log4j.xml b/store-implementation/simple-federated-store/src/test/resources/log4j.xml
new file mode 100644
index 00000000000..27513116b58
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/test/resources/log4j.xml
@@ -0,0 +1,38 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!--
+  ~ Copyright 2017-2020 Crown Copyright
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"
+                     debug="false">
+    <appender name="console" class="org.apache.log4j.ConsoleAppender">
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%c{3} %p %x - %m%n"/>
+        </layout>
+    </appender>
+    <logger name="uk.gov.gchq.gaffer.federatedstore.operation.handler.FederatedAddGraphHandlerParent">
+        <level value="error"/>
+    </logger>
+    <!-- Fix to filter out warnings from this class about
+    Accumulo Client was garbage collected without being closed  -->
+    <logger name="org.apache.accumulo.core.singletons.SingletonReservation">
+        <level value="error"/>
+    </logger>
+    <root>
+        <priority value="warn"></priority>
+        <appender-ref ref="console"></appender-ref>
+    </root>
+</log4j:configuration>
diff --git a/store-implementation/simple-federated-store/src/test/resources/map-store.properties b/store-implementation/simple-federated-store/src/test/resources/map-store.properties
new file mode 100644
index 00000000000..96683d87f30
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/test/resources/map-store.properties
@@ -0,0 +1 @@
+gaffer.store.class=uk.gov.gchq.gaffer.mapstore.MapStore
diff --git a/store-implementation/simple-federated-store/src/test/resources/modern/schema/schema.json b/store-implementation/simple-federated-store/src/test/resources/modern/schema/schema.json
new file mode 100644
index 00000000000..4a95e3eee2b
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/test/resources/modern/schema/schema.json
@@ -0,0 +1,90 @@
+{
+    "entities": {
+        "id": {
+            "vertex": "string.id"
+        },
+        "person": {
+            "vertex": "string.id",
+            "properties": {
+                "name": "property.string",
+                "age": "property.integer"
+            }
+        },
+        "software": {
+            "vertex": "string.id",
+            "properties": {
+                "name": "property.string",
+                "lang": "property.string"
+            }
+        }
+    },
+    "edges": {
+        "knows": {
+            "source": "string.id",
+            "destination": "string.id",
+            "directed": "true",
+            "properties": {
+                "weight": "property.double"
+            }
+        },
+        "created": {
+            "source": "string.id",
+            "destination": "string.id",
+            "directed": "true",
+            "properties": {
+                "weight": "property.double"
+            }
+        },
+        "dependsOn": {
+            "source": "string.id",
+            "destination": "string.id",
+            "directed": "true"
+        },
+        "encapsulates": {
+            "source": "string.id",
+            "destination": "string.id",
+            "directed": "true"
+        }
+    },
+    "types": {
+        "int.id": {
+            "class": "java.lang.Integer"
+        },
+        "long.id": {
+            "class": "java.lang.Long"
+        },
+        "string.id": {
+            "class": "java.lang.String"
+        },
+        "uuid.id": {
+            "class": "java.util.UUID"
+        },
+        "true": {
+            "class": "java.lang.Boolean"
+        },
+        "property.string": {
+            "class": "java.lang.String",
+            "aggregateFunction": {
+                "class": "uk.gov.gchq.koryphe.impl.binaryoperator.Max"
+            }
+        },
+        "property.integer": {
+            "class": "java.lang.Integer",
+            "aggregateFunction": {
+                "class": "uk.gov.gchq.koryphe.impl.binaryoperator.Sum"
+            }
+        },
+        "property.double": {
+            "class": "java.lang.Double",
+            "aggregateFunction": {
+                "class": "uk.gov.gchq.koryphe.impl.binaryoperator.Sum"
+            }
+        },
+        "property.float": {
+            "class": "java.lang.Float",
+            "aggregateFunction": {
+                "class": "uk.gov.gchq.koryphe.impl.binaryoperator.Sum"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/store-implementation/simple-federated-store/src/test/resources/operationDeclarations.json b/store-implementation/simple-federated-store/src/test/resources/operationDeclarations.json
new file mode 100644
index 00000000000..24a1fbd37a3
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/test/resources/operationDeclarations.json
@@ -0,0 +1,16 @@
+{
+    "operations": [
+        {
+            "operation": "uk.gov.gchq.gaffer.operation.impl.export.localfile.ImportFromLocalFile",
+            "handler": {
+                "class": "uk.gov.gchq.gaffer.store.operation.handler.export.localfile.ImportFromLocalFileHandler"
+            }
+        },
+        {
+            "operation": "uk.gov.gchq.gaffer.operation.impl.export.localfile.ExportToLocalFile",
+            "handler": {
+                "class": "uk.gov.gchq.gaffer.store.operation.handler.export.localfile.ExportToLocalFileHandler"
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/store-implementation/simple-federated-store/src/test/resources/single-use-accumulo-store.properties b/store-implementation/simple-federated-store/src/test/resources/single-use-accumulo-store.properties
new file mode 100644
index 00000000000..da552bbce4a
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/test/resources/single-use-accumulo-store.properties
@@ -0,0 +1,26 @@
+#
+# Copyright 2024 Crown Copyright
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+gaffer.store.class=uk.gov.gchq.gaffer.accumulostore.SingleUseMiniAccumuloStore
+accumulo.instance=federatedTestInstance
+accumulo.zookeepers=localhost
+accumulo.user=user
+accumulo.password=password
+accumulo.mini.visibilities=vis1,vis2,publicVisibility,privateVisibility,public,private
+
+#General store config
+gaffer.cache.service.default.class=uk.gov.gchq.gaffer.cache.impl.HashMapCacheService
+gaffer.store.operation.declarations=operationDeclarations.json
+gaffer.store.namedview.enabled=true
diff --git a/store-implementation/simple-federated-store/src/test/resources/store.properties b/store-implementation/simple-federated-store/src/test/resources/store.properties
new file mode 100644
index 00000000000..e3686a29154
--- /dev/null
+++ b/store-implementation/simple-federated-store/src/test/resources/store.properties
@@ -0,0 +1,7 @@
+gaffer.store.class=uk.gov.gchq.gaffer.federated.simple.PreDefinedFederatedStore
+gaffer.store.properties.class=uk.gov.gchq.gaffer.federated.simple.FederatedStoreProperties
+gaffer.store.federated.default.aggregateElements=true
+gaffer.store.federated.merge.collection.class=uk.gov.gchq.koryphe.impl.binaryoperator.CollectionIntersect
+gaffer.store.federated.merge.string.class=uk.gov.gchq.koryphe.impl.binaryoperator.StringDeduplicateConcat
+gaffer.store.federated.default.graphIds=graphA,graphB
+gaffer.cache.service.default.class=uk.gov.gchq.gaffer.cache.impl.HashMapCacheService