diff --git a/NOTICES b/NOTICES
index 6e55cb6f7..891b105db 100755
--- a/NOTICES
+++ b/NOTICES
@@ -20,7 +20,7 @@ Gaffer tools is built using maven. This process will automatically pull in depen
  projects below.
 
 
-Gaffer (uk.gov.gchq.gaffer:gaffer2:2.0.0-alpha-0.1):
+Gaffer (uk.gov.gchq.gaffer:gaffer2:2.0.0-alpha-0.2):
 
 - Apache License, Version 2.0
 
diff --git a/cd/setup_ui_system_tests.sh b/cd/setup_ui_system_tests.sh
index 1b8cf945d..82d3d0448 100755
--- a/cd/setup_ui_system_tests.sh
+++ b/cd/setup_ui_system_tests.sh
@@ -3,7 +3,7 @@
 set -e
 
 mvn install -P quick,road-traffic-demo -B -pl ui &
-curl -OL https://github.com/mozilla/geckodriver/releases/download/v0.23.0/geckodriver-v0.23.0-linux64.tar.gz
-tar -xf geckodriver-v0.23.0-linux64.tar.gz
+curl -OL https://github.com/mozilla/geckodriver/releases/download/v0.31.0/geckodriver-v0.31.0-linux64.tar.gz
+tar -xf geckodriver-v0.31.0-linux64.tar.gz
 mv geckodriver ui/
 sleep 1m
diff --git a/mini-accumulo-cluster/pom.xml b/mini-accumulo-cluster/pom.xml
index 6549760d4..31329505f 100755
--- a/mini-accumulo-cluster/pom.xml
+++ b/mini-accumulo-cluster/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2016-2019 Crown Copyright
+  ~ Copyright 2016-2022 Crown Copyright
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -40,16 +40,49 @@
             <groupId>org.apache.accumulo</groupId>
             <artifactId>accumulo-minicluster</artifactId>
             <version>${accumulo.version}</version>
+            <exclusions>
+                <!-- Conflicts with Reload4j -->
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.accumulo</groupId>
             <artifactId>accumulo-core</artifactId>
             <version>${accumulo.version}</version>
+            <exclusions>
+                <!-- Conflicts with Reload4j -->
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-hdfs</artifactId>
             <version>${hadoop.version}</version>
+            <exclusions>
+                <!-- Conflicts with Reload4j -->
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 
@@ -58,6 +91,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.3.0</version>
                 <configuration>
                     <skipAssembly>${skip.jar-with-dependencies}</skipAssembly>
                 </configuration>
diff --git a/performance-testing/performance-testing-accumulo-store/pom.xml b/performance-testing/performance-testing-accumulo-store/pom.xml
index 7ff55da92..a6839a3b6 100644
--- a/performance-testing/performance-testing-accumulo-store/pom.xml
+++ b/performance-testing/performance-testing-accumulo-store/pom.xml
@@ -32,12 +32,34 @@
             <artifactId>accumulo-minicluster</artifactId>
             <version>${accumulo.version}</version>
             <scope>test</scope>
+            <exclusions>
+                <!-- Conflicts with Reload4j -->
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-hdfs</artifactId>
             <version>${hadoop.version}</version>
             <scope>test</scope>
+            <exclusions>
+                <!-- Conflicts with Reload4j -->
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>uk.gov.gchq.gaffer</groupId>
diff --git a/performance-testing/performance-testing-accumulo-store/src/main/java/uk/gov/gchq/gaffer/accumulostore/performancetesting/ingest/BytesWritableElementGenerator.java b/performance-testing/performance-testing-accumulo-store/src/main/java/uk/gov/gchq/gaffer/accumulostore/performancetesting/ingest/BytesWritableElementGenerator.java
index e7da53806..4d27b7d80 100644
--- a/performance-testing/performance-testing-accumulo-store/src/main/java/uk/gov/gchq/gaffer/accumulostore/performancetesting/ingest/BytesWritableElementGenerator.java
+++ b/performance-testing/performance-testing-accumulo-store/src/main/java/uk/gov/gchq/gaffer/accumulostore/performancetesting/ingest/BytesWritableElementGenerator.java
@@ -17,7 +17,6 @@
 
 import org.apache.hadoop.io.BytesWritable;
 
-import uk.gov.gchq.gaffer.commonutil.iterable.WrappedCloseableIterable;
 import uk.gov.gchq.gaffer.data.element.Element;
 import uk.gov.gchq.gaffer.data.generator.ElementGenerator;
 import uk.gov.gchq.gaffer.exception.SerialisationException;
@@ -46,6 +45,6 @@ public Iterable<? extends Element> apply(final Iterable<? extends BytesWritable>
                     }
                 });
         final Iterable<Element> elementIterable = elementStream::iterator;
-        return new WrappedCloseableIterable<>(elementIterable::iterator);
+        return elementIterable::iterator;
     }
 }
diff --git a/performance-testing/performance-testing-aws/pom.xml b/performance-testing/performance-testing-aws/pom.xml
index 2c3924d08..93399dfbd 100644
--- a/performance-testing/performance-testing-aws/pom.xml
+++ b/performance-testing/performance-testing-aws/pom.xml
@@ -32,6 +32,17 @@
             <groupId>org.apache.accumulo</groupId>
             <artifactId>accumulo-server-base</artifactId>
             <version>${accumulo.version}</version>
+            <exclusions>
+                <!-- Conflicts with Reload4j -->
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!--
diff --git a/performance-testing/performance-testing-core/pom.xml b/performance-testing/performance-testing-core/pom.xml
index 7bfdf9114..a861a62ba 100644
--- a/performance-testing/performance-testing-core/pom.xml
+++ b/performance-testing/performance-testing-core/pom.xml
@@ -27,12 +27,34 @@
             <artifactId>accumulo-minicluster</artifactId>
             <version>${accumulo.version}</version>
             <scope>test</scope>
+            <exclusions>
+                <!-- Conflicts with Reload4j -->
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-hdfs</artifactId>
             <version>${hadoop.version}</version>
             <scope>test</scope>
+            <exclusions>
+                <!-- Conflicts with Reload4j -->
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>uk.gov.gchq.gaffer</groupId>
diff --git a/performance-testing/performance-testing-core/src/main/java/uk/gov/gchq/gaffer/performancetesting/query/QueryTest.java b/performance-testing/performance-testing-core/src/main/java/uk/gov/gchq/gaffer/performancetesting/query/QueryTest.java
index 1c6cf4ebb..6ede82c09 100644
--- a/performance-testing/performance-testing-core/src/main/java/uk/gov/gchq/gaffer/performancetesting/query/QueryTest.java
+++ b/performance-testing/performance-testing-core/src/main/java/uk/gov/gchq/gaffer/performancetesting/query/QueryTest.java
@@ -18,7 +18,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import uk.gov.gchq.gaffer.commonutil.iterable.CloseableIterable;
 import uk.gov.gchq.gaffer.data.element.Element;
 import uk.gov.gchq.gaffer.graph.Graph;
 import uk.gov.gchq.gaffer.graph.GraphConfig;
@@ -114,7 +113,7 @@ private void queryBatch(final Supplier<? extends ElementSeed> elementSeedSupplie
         final long startTime = System.currentTimeMillis();
         final long numResults;
         try {
-            final CloseableIterable<? extends Element> results = graph.execute(getElements, new User());
+            final Iterable<? extends Element> results = graph.execute(getElements, new User());
             numResults = StreamSupport.stream(results.spliterator(), false).count();
         } catch (final OperationException e) {
             LOGGER.error("OperationException thrown after " + (System.currentTimeMillis() - startTime) / 1000.0
diff --git a/pom.xml b/pom.xml
index 177237314..d4507eb9e 100755
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>uk.gov.gchq.gaffer</groupId>
         <artifactId>gaffer2</artifactId>
-        <version>2.0.0-alpha-0.1</version>
+        <version>2.0.0-alpha-0.2</version>
     </parent>
 
     <artifactId>gaffer-tools</artifactId>
@@ -36,7 +36,7 @@
     </modules>
 
     <properties>
-        <gaffer.version>2.0.0-alpha-0.1</gaffer.version>
+        <gaffer.version>2.0.0-alpha-0.2</gaffer.version>
         <scm.url>
             https://github.com/gchq/gaffer-tools
         </scm.url>
@@ -153,7 +153,8 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-failsafe-plugin</artifactId>
-                        <version>${failsafe.version}</version>
+                        <!-- Older Failsafe required for Selenium -->
+                        <version>2.22.2</version>
                         <executions>
                             <execution>
                                 <id>system-test</id>
@@ -188,8 +189,8 @@
                         </executions>
                     </plugin>
                     <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>findbugs-maven-plugin</artifactId>
+                        <groupId>com.github.spotbugs</groupId>
+                        <artifactId>spotbugs-maven-plugin</artifactId>
                         <executions>
                             <execution>
                                 <id>analyze-compile</id>
diff --git a/python-shell/src/__init__.py b/python-shell/src/__init__.py
index 7d5be1e2a..121d3a323 100644
--- a/python-shell/src/__init__.py
+++ b/python-shell/src/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "2.0.0-alpha-0.1"
+__version__ = "2.0.0-alpha-0.2"
 
 __title__ = "gafferpy"
 __description__ = "Gaffer Python Shell"
diff --git a/python-shell/src/gafferpy/__init__.py b/python-shell/src/gafferpy/__init__.py
index 7d5be1e2a..121d3a323 100644
--- a/python-shell/src/gafferpy/__init__.py
+++ b/python-shell/src/gafferpy/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "2.0.0-alpha-0.1"
+__version__ = "2.0.0-alpha-0.2"
 
 __title__ = "gafferpy"
 __description__ = "Gaffer Python Shell"
diff --git a/python-shell/src/gafferpy/gaffer_functions.py b/python-shell/src/gafferpy/gaffer_functions.py
index 1f5130386..e8ccc41c5 100755
--- a/python-shell/src/gafferpy/gaffer_functions.py
+++ b/python-shell/src/gafferpy/gaffer_functions.py
@@ -1090,11 +1090,16 @@ def to_json(self):
 class ToSet(AbstractFunction):
     CLASS = 'uk.gov.gchq.koryphe.impl.function.ToSet'
 
-    def __init__(self):
+    def __init__(self, implementation=None):
         super().__init__(_class_name=self.CLASS)
+        self.implementation = implementation
 
     def to_json(self):
-        return super().to_json()
+        function_json = super().to_json()
+        if (self.implementation is not None):
+            function_json["implementation"] = self.implementation
+
+        return function_json
 
       
 class ToArray(AbstractFunction):
@@ -1338,6 +1343,14 @@ def to_json(self):
         
         return function_json
 
+class ToDouble(AbstractFunction):
+    CLASS = "uk.gov.gchq.koryphe.impl.function.ToDouble"
+
+    def __init__(self):
+        super().__init__(_class_name=self.CLASS)
+
+    def to_json(self):
+        return super().to_json()
 
 class FirstValid(AbstractFunction):
     CLASS = "uk.gov.gchq.koryphe.impl.function.FirstValid"
diff --git a/python-shell/src/test/test_connector.py b/python-shell/src/test/test_connector.py
index 95ca43b57..f4eea7858 100755
--- a/python-shell/src/test/test_connector.py
+++ b/python-shell/src/test/test_connector.py
@@ -129,7 +129,7 @@ def test_is_operation_supported(self):
           "exampleJson": {
             "class": "uk.gov.gchq.gaffer.operation.impl.get.GetAllElements"
           },
-          "outputClassName": "uk.gov.gchq.gaffer.commonutil.iterable.CloseableIterable<uk.gov.gchq.gaffer.data.element.Element>"
+          "outputClassName": "java.lang.Iterable<uk.gov.gchq.gaffer.data.element.Element>"
         }
             '''
 
diff --git a/python-shell/src/test/test_connector_requests.py b/python-shell/src/test/test_connector_requests.py
index 9f48b4033..e7f9c2776 100755
--- a/python-shell/src/test/test_connector_requests.py
+++ b/python-shell/src/test/test_connector_requests.py
@@ -129,7 +129,7 @@ def test_is_operation_supported(self):
           "exampleJson": {
             "class": "uk.gov.gchq.gaffer.operation.impl.get.GetAllElements"
           },
-          "outputClassName": "uk.gov.gchq.gaffer.commonutil.iterable.CloseableIterable<uk.gov.gchq.gaffer.data.element.Element>"
+          "outputClassName": "java.lang.Iterable<uk.gov.gchq.gaffer.data.element.Element>"
         }
             '''
 
diff --git a/ui/pom.xml b/ui/pom.xml
index a6e0b814d..7362f56f6 100644
--- a/ui/pom.xml
+++ b/ui/pom.xml
@@ -28,7 +28,7 @@
         <standalone-ui-path>ui</standalone-ui-path>
         <standalone-rest-path>rest</standalone-rest-path>
         <standalone-port>8080</standalone-port>
-        <selenium.version>3.4.0</selenium.version>
+        <selenium.version>3.141.59</selenium.version>
         <jasmine.plugin.version>2.2</jasmine.plugin.version>
         <jasmine.test.paths>**/*-spec.js</jasmine.test.paths>
     </properties>
@@ -43,7 +43,8 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>21.0</version>
+            <!-- Newer Guava required for Selenium -->
+            <version>25.0-jre</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -58,13 +59,33 @@
             <version>${gaffer.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>uk.gov.gchq.gaffer</groupId>
+            <artifactId>federated-demo</artifactId>
+            <version>${gaffer.version}</version>
+            <type>war</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>uk.gov.gchq.gaffer</groupId>
+            <artifactId>road-traffic-rest</artifactId>
+            <version>${gaffer.version}</version>
+            <type>war</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>uk.gov.gchq.gaffer</groupId>
+            <artifactId>map-rest</artifactId>
+            <version>${gaffer.version}</version>
+            <type>war</type>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>${maven-war-plugin.version}</version>
                 <configuration>
                     <webResources>
                         <resource>
@@ -133,19 +154,30 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.apache.tomcat.maven</groupId>
-                        <artifactId>tomcat7-maven-plugin</artifactId>
-                        <version>2.0</version>
+                        <groupId>org.codehaus.cargo</groupId>
+                        <artifactId>cargo-maven3-plugin</artifactId>
+                        <version>${cargo.plugin.version}</version>
                         <configuration>
-                            <path>/${standalone-ui-path}</path>
-                            <port>${standalone-port}</port>
+                            <deployables>
+                                <deployable>
+                                    <properties>
+                                        <context>/${standalone-ui-path}</context>
+                                    </properties>
+                                </deployable>
+                            </deployables>
+                            <properties>
+                                <cargo.servlet.port>${standalone-port}</cargo.servlet.port>
+                            </properties>
+                            <container>
+                                <containerId>tomcat9x</containerId>
+                            </container>
                         </configuration>
                         <executions>
                             <execution>
                                 <id>deploy</id>
                                 <phase>integration-test</phase>
                                 <goals>
-                                    <goal>run-war</goal>
+                                    <goal>run</goal>
                                 </goals>
                             </execution>
                         </executions>
@@ -164,7 +196,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-war-plugin</artifactId>
-                        <version>${maven-war-plugin.version}</version>
                         <configuration>
                             <webResources>
                                 <resource>
@@ -177,81 +208,89 @@
                         </configuration>
                     </plugin>
                     <plugin>
-                        <groupId>org.apache.tomcat.maven</groupId>
-                        <artifactId>tomcat7-maven-plugin</artifactId>
-                        <version>2.0</version>
+                        <groupId>org.codehaus.cargo</groupId>
+                        <artifactId>cargo-maven3-plugin</artifactId>
+                        <version>${cargo.plugin.version}</version>
                         <configuration>
-                            <path>/</path>
-                            <port>${standalone-port}</port>
-                            <webapps>
-                                <webapp>
-                                    <contextPath>/${standalone-ui-path}
-                                    </contextPath>
+                            <deployables>
+                                <deployable>
                                     <groupId>uk.gov.gchq.gaffer</groupId>
                                     <artifactId>ui</artifactId>
-                                    <version>${project.parent.version}</version>
                                     <type>war</type>
-                                    <asWebapp>true</asWebapp>
-                                </webapp>
-                                <webapp>
-                                    <contextPath>/${standalone-rest-path}
-                                    </contextPath>
+                                    <properties>
+                                        <context>/${standalone-ui-path}</context>
+                                    </properties>
+                                </deployable>
+                                <deployable>
                                     <groupId>uk.gov.gchq.gaffer</groupId>
                                     <artifactId>road-traffic-rest</artifactId>
-                                    <version>${gaffer.version}</version>
                                     <type>war</type>
-                                    <asWebapp>true</asWebapp>
-                                </webapp>
-                            </webapps>
-                            <systemProperties>
-                                <gaffer.properties.app.title>
-                                    Road Traffic Example
-                                </gaffer.properties.app.title>
-                                <gaffer.properties.app.description>
-                                    Example using road traffic data.
-                                    The sample data used is taken from the
-                                    Department for Transport
-                                    &lt;a
-                                    href='http://data.dft.gov.uk/gb-traffic-matrix/Raw_count_data_major_roads.zip'
-                                    &gt;GB Road Traffic Counts&lt;/a&gt;,
-                                    which is licensed under the
-                                    &lt;a
-                                    href='http://www.nationalarchives.gov.uk/doc/open-government-licence/version/3'
-                                    &gt;Open Government Licence&lt;/a&gt;.
-                                </gaffer.properties.app.description>
-                                <gaffer.rest-api.basePath>
-                                    ${standalone-rest-path}
-                                </gaffer.rest-api.basePath>
-                                <gaffer.graph.config>
-                                    ${project.basedir}/example/road-traffic/graphConfig.json
-                                </gaffer.graph.config>
-                                <gaffer.schemas>
-                                    ${project.basedir}/example/road-traffic/schema
-                                </gaffer.schemas>
-                                <gaffer.storeProperties>
-                                    ${project.basedir}/example/road-traffic/map/store.properties
-                                </gaffer.storeProperties>
-                                <roadTraffic.dataLoader.dataPath>
-                                    ${project.basedir}/example/road-traffic/roadTrafficSampleData.csv
-                                </roadTraffic.dataLoader.dataPath>
-                                <gaffer.graph.hook.add.operations.path>
-                                    ${project.basedir}/example/road-traffic/addOperationsToChain.json
-                                </gaffer.graph.hook.add.operations.path>
-                                <gaffer.error-mode.debug>
-                                    false
-                                </gaffer.error-mode.debug>
-                                <gaffer.properties.app.logo.src>
-                                    images/logo.png
-                                </gaffer.properties.app.logo.src>
-
-                            </systemProperties>
+                                    <properties>
+                                        <context>/${standalone-rest-path}</context>
+                                    </properties>
+                                </deployable>
+                            </deployables>
+                            <properties>
+                                <cargo.servlet.port>${standalone-port}</cargo.servlet.port>
+                            </properties>
+                            <container>
+                                <containerId>tomcat9x</containerId>
+                                <dependencies>
+                                    <dependency>
+                                        <groupId>uk.gov.gchq.gaffer</groupId>
+                                        <artifactId>road-traffic-rest</artifactId>
+                                        <type>war</type>
+                                    </dependency>
+                                </dependencies>
+                                <systemProperties>
+                                    <gaffer.properties.app.title>
+                                        Road Traffic Example
+                                    </gaffer.properties.app.title>
+                                    <gaffer.properties.app.description>
+                                        Example using road traffic data.
+                                        The sample data used is taken from the
+                                        Department for Transport
+                                        &lt;a
+                                        href='http://data.dft.gov.uk/gb-traffic-matrix/Raw_count_data_major_roads.zip'
+                                        &gt;GB Road Traffic Counts&lt;/a&gt;,
+                                        which is licensed under the
+                                        &lt;a
+                                        href='http://www.nationalarchives.gov.uk/doc/open-government-licence/version/3'
+                                        &gt;Open Government Licence&lt;/a&gt;.
+                                    </gaffer.properties.app.description>
+                                    <gaffer.rest-api.basePath>
+                                        ${standalone-rest-path}
+                                    </gaffer.rest-api.basePath>
+                                    <gaffer.graph.config>
+                                        ${project.basedir}/example/road-traffic/graphConfig.json
+                                    </gaffer.graph.config>
+                                    <gaffer.schemas>
+                                        ${project.basedir}/example/road-traffic/schema
+                                    </gaffer.schemas>
+                                    <gaffer.storeProperties>
+                                        ${project.basedir}/example/road-traffic/map/store.properties
+                                    </gaffer.storeProperties>
+                                    <roadTraffic.dataLoader.dataPath>
+                                        ${project.basedir}/example/road-traffic/roadTrafficSampleData.csv
+                                    </roadTraffic.dataLoader.dataPath>
+                                    <gaffer.graph.hook.add.operations.path>
+                                        ${project.basedir}/example/road-traffic/addOperationsToChain.json
+                                    </gaffer.graph.hook.add.operations.path>
+                                    <gaffer.error-mode.debug>
+                                        false
+                                    </gaffer.error-mode.debug>
+                                    <gaffer.properties.app.logo.src>
+                                        images/logo.png
+                                    </gaffer.properties.app.logo.src>
+                                </systemProperties>
+                            </container>
                         </configuration>
                         <executions>
                             <execution>
                                 <id>deploy</id>
                                 <phase>integration-test</phase>
                                 <goals>
-                                    <goal>run-war</goal>
+                                    <goal>run</goal>
                                 </goals>
                             </execution>
                         </executions>
@@ -270,7 +309,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-war-plugin</artifactId>
-                        <version>${maven-war-plugin.version}</version>
                         <configuration>
                             <webResources>
                                 <resource>
@@ -283,62 +321,71 @@
                         </configuration>
                     </plugin>
                     <plugin>
-                        <groupId>org.apache.tomcat.maven</groupId>
-                        <artifactId>tomcat7-maven-plugin</artifactId>
-                        <version>2.0</version>
+                        <groupId>org.codehaus.cargo</groupId>
+                        <artifactId>cargo-maven3-plugin</artifactId>
+                        <version>${cargo.plugin.version}</version>
                         <configuration>
-                            <path>/</path>
-                            <port>${standalone-port}</port>
-                            <webapps>
-                                <webapp>
-                                    <contextPath>/${standalone-ui-path}
-                                    </contextPath>
+                            <deployables>
+                                <deployable>
                                     <groupId>uk.gov.gchq.gaffer</groupId>
                                     <artifactId>ui</artifactId>
-                                    <version>${project.parent.version}</version>
                                     <type>war</type>
-                                    <asWebapp>true</asWebapp>
-                                </webapp>
-                                <webapp>
-                                    <contextPath>/${standalone-rest-path}
-                                    </contextPath>
+                                    <properties>
+                                        <context>/${standalone-ui-path}</context>
+                                    </properties>
+                                </deployable>
+                                <deployable>
                                     <groupId>uk.gov.gchq.gaffer</groupId>
                                     <artifactId>federated-demo</artifactId>
-                                    <version>${gaffer.version}</version>
                                     <type>war</type>
-                                    <asWebapp>true</asWebapp>
-                                </webapp>
-                            </webapps>
-                            <systemProperties>
-                                <gaffer.properties.app.title>
-                                    Federated Gaffer Example
-                                </gaffer.properties.app.title>
-                                <gaffer.properties.app.description>
-                                    Example of a Gaffer Federated Store
-                                </gaffer.properties.app.description>
-                                <gaffer.rest-api.basePath>
-                                    ${standalone-rest-path}
-                                </gaffer.rest-api.basePath>
-                                <gaffer.graph.config>
-                                    ${project.basedir}/example/federated/graphConfig.json
-                                </gaffer.graph.config>
-                                <gaffer.storeProperties>
-                                    ${project.basedir}/example/federated/federatedStore.properties
-                                </gaffer.storeProperties>
-                                <gaffer.error-mode.debug>
-                                    false
-                                </gaffer.error-mode.debug>
-                                <gaffer.properties.app.logo.src>
-                                    images/logo.png
-                                </gaffer.properties.app.logo.src>
-                            </systemProperties>
+                                    <properties>
+                                        <context>/${standalone-rest-path}</context>
+                                    </properties>
+                                </deployable>
+                            </deployables>
+                            <properties>
+                                <cargo.servlet.port>${standalone-port}</cargo.servlet.port>
+                            </properties>
+                            <container>
+                                <containerId>tomcat9x</containerId>
+                                <dependencies>
+                                    <dependency>
+                                        <groupId>uk.gov.gchq.gaffer</groupId>
+                                        <artifactId>federated-demo</artifactId>
+                                        <type>war</type>
+                                    </dependency>
+                                </dependencies>
+                                <systemProperties>
+                                    <gaffer.properties.app.title>
+                                        Federated Gaffer Example
+                                    </gaffer.properties.app.title>
+                                    <gaffer.properties.app.description>
+                                        Example of a Gaffer Federated Store
+                                    </gaffer.properties.app.description>
+                                    <gaffer.rest-api.basePath>
+                                        ${standalone-rest-path}
+                                    </gaffer.rest-api.basePath>
+                                    <gaffer.graph.config>
+                                        ${project.basedir}/example/federated/graphConfig.json
+                                    </gaffer.graph.config>
+                                    <gaffer.storeProperties>
+                                        ${project.basedir}/example/federated/federatedStore.properties
+                                    </gaffer.storeProperties>
+                                    <gaffer.error-mode.debug>
+                                        false
+                                    </gaffer.error-mode.debug>
+                                    <gaffer.properties.app.logo.src>
+                                        images/logo.png
+                                    </gaffer.properties.app.logo.src>
+                                </systemProperties>
+                            </container>
                         </configuration>
                         <executions>
                             <execution>
                                 <id>deploy</id>
                                 <phase>integration-test</phase>
                                 <goals>
-                                    <goal>run-war</goal>
+                                    <goal>run</goal>
                                 </goals>
                             </execution>
                         </executions>
@@ -357,7 +404,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-war-plugin</artifactId>
-                        <version>${maven-war-plugin.version}</version>
                         <configuration>
                             <webResources>
                                 <resource>
@@ -370,65 +416,74 @@
                         </configuration>
                     </plugin>
                     <plugin>
-                        <groupId>org.apache.tomcat.maven</groupId>
-                        <artifactId>tomcat7-maven-plugin</artifactId>
-                        <version>2.0</version>
+                        <groupId>org.codehaus.cargo</groupId>
+                        <artifactId>cargo-maven3-plugin</artifactId>
+                        <version>${cargo.plugin.version}</version>
                         <configuration>
-                            <path>/</path>
-                            <port>${standalone-port}</port>
-                            <webapps>
-                                <webapp>
-                                    <contextPath>/${standalone-ui-path}
-                                    </contextPath>
+                            <deployables>
+                                <deployable>
                                     <groupId>uk.gov.gchq.gaffer</groupId>
                                     <artifactId>ui</artifactId>
-                                    <version>${project.parent.version}</version>
                                     <type>war</type>
-                                    <asWebapp>true</asWebapp>
-                                </webapp>
-                                <webapp>
-                                    <contextPath>/${standalone-rest-path}
-                                    </contextPath>
+                                    <properties>
+                                        <context>/${standalone-ui-path}</context>
+                                    </properties>
+                                </deployable>
+                                <deployable>
                                     <groupId>uk.gov.gchq.gaffer</groupId>
                                     <artifactId>map-rest</artifactId>
-                                    <version>${gaffer.version}</version>
                                     <type>war</type>
-                                    <asWebapp>true</asWebapp>
-                                </webapp>
-                            </webapps>
-                            <systemProperties>
-                                <gaffer.properties.app.title>
-                                    TypeSubTypeValue Gaffer Example
-                                </gaffer.properties.app.title>
-                                <gaffer.properties.app.description>
-                                    Example of a Gaffer Store with TypeSubTypeValue vertices
-                                </gaffer.properties.app.description>
-                                <gaffer.rest-api.basePath>
-                                    ${standalone-rest-path}
-                                </gaffer.rest-api.basePath>
-                                <gaffer.graph.config>
-                                    ${project.basedir}/example/type-subtype-value/graphConfig.json
-                                </gaffer.graph.config>
-                                <gaffer.schemas>
-                                    ${project.basedir}/example/type-subtype-value/schema
-                                </gaffer.schemas>
-                                <gaffer.storeProperties>
-                                    ${project.basedir}/example/type-subtype-value/map/store.properties
-                                </gaffer.storeProperties>
-                                <gaffer.error-mode.debug>
-                                    true
-                                </gaffer.error-mode.debug>
-                                <gaffer.properties.app.logo.src>
-                                    images/logo.png
-                                </gaffer.properties.app.logo.src>
-                            </systemProperties>
+                                    <properties>
+                                        <context>/${standalone-rest-path}</context>
+                                    </properties>
+                                </deployable>
+                            </deployables>
+                            <properties>
+                                <cargo.servlet.port>${standalone-port}</cargo.servlet.port>
+                            </properties>
+                            <container>
+                                <containerId>tomcat9x</containerId>
+                                <dependencies>
+                                    <dependency>
+                                        <groupId>uk.gov.gchq.gaffer</groupId>
+                                        <artifactId>map-rest</artifactId>
+                                        <type>war</type>
+                                    </dependency>
+                                </dependencies>
+                                <systemProperties>
+                                    <gaffer.properties.app.title>
+                                        TypeSubTypeValue Gaffer Example
+                                    </gaffer.properties.app.title>
+                                    <gaffer.properties.app.description>
+                                        Example of a Gaffer Store with TypeSubTypeValue vertices
+                                    </gaffer.properties.app.description>
+                                    <gaffer.rest-api.basePath>
+                                        ${standalone-rest-path}
+                                    </gaffer.rest-api.basePath>
+                                    <gaffer.graph.config>
+                                        ${project.basedir}/example/type-subtype-value/graphConfig.json
+                                    </gaffer.graph.config>
+                                    <gaffer.schemas>
+                                        ${project.basedir}/example/type-subtype-value/schema
+                                    </gaffer.schemas>
+                                    <gaffer.storeProperties>
+                                        ${project.basedir}/example/type-subtype-value/map/store.properties
+                                    </gaffer.storeProperties>
+                                    <gaffer.error-mode.debug>
+                                        true
+                                    </gaffer.error-mode.debug>
+                                    <gaffer.properties.app.logo.src>
+                                        images/logo.png
+                                    </gaffer.properties.app.logo.src>
+                                </systemProperties>
+                            </container>
                         </configuration>
                         <executions>
                             <execution>
                                 <id>deploy</id>
                                 <phase>integration-test</phase>
                                 <goals>
-                                    <goal>run-war</goal>
+                                    <goal>run</goal>
                                 </goals>
                             </execution>
                         </executions>
@@ -457,8 +512,8 @@
                         </executions>
                     </plugin>
                     <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>findbugs-maven-plugin</artifactId>
+                        <groupId>com.github.spotbugs</groupId>
+                        <artifactId>spotbugs-maven-plugin</artifactId>
                         <executions>
                             <execution>
                                 <id>analyze-compile</id>
diff --git a/ui/src/test/java/uk/gov/gchq/gaffer/ui/QueryBuilderST.java b/ui/src/test/java/uk/gov/gchq/gaffer/ui/QueryBuilderST.java
index 416d7c61b..d748c3ada 100644
--- a/ui/src/test/java/uk/gov/gchq/gaffer/ui/QueryBuilderST.java
+++ b/ui/src/test/java/uk/gov/gchq/gaffer/ui/QueryBuilderST.java
@@ -28,6 +28,7 @@
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.firefox.FirefoxDriver;
+import org.openqa.selenium.firefox.FirefoxOptions;
 import org.openqa.selenium.firefox.FirefoxProfile;
 
 import uk.gov.gchq.gaffer.exception.SerialisationException;
@@ -129,7 +130,9 @@ public static void beforeClass() throws OperationException {
 
         FirefoxProfile profile = new FirefoxProfile();
         profile.setPreference("intl.accept_languages", "en-GB"); // for dates
-        driver = new FirefoxDriver(profile);
+        FirefoxOptions options = new FirefoxOptions();
+        options.setProfile(profile);
+        driver = new FirefoxDriver(options);
 
 
         // Create a large window to ensure we don't need to scroll