diff --git a/.travis.yml b/.travis.yml
index c2ebba7..0e06bd6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ sudo: true
 
 language: java
 
-jdk: oraclejdk8
+jdk: openjdk11
 
 cache:
   directories:
@@ -17,6 +17,6 @@ install:
   - if [[ $TRAVIS_PULL_REQUEST = false ]] && [[ $TRAVIS_BRANCH = master ]] || [[ $TRAVIS_TAG = v* ]]; then GOAL=deploy; else GOAL=install; fi
   - if [[ $TRAVIS_TAG = v* ]]; then ADDITIONAL_PROFILES=release; mvn -q -U org.seedstack:seedstack-maven-plugin:release; else ADDITIONAL_PROFILES=snapshots; fi
 
-script: mvn -q -U -T 2 -Pbuild-number,compatibility,bintray,javadoc,$ADDITIONAL_PROFILES $GOAL jacoco:report
+script: mvn -q -U -T 2 -Pbuild-number,compatibility,bintray,javadoc,v2,$ADDITIONAL_PROFILES $GOAL jacoco:report
 
 after_success: mvn -q coveralls:report -DrepoToken=$COVERALLS_TOKEN
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ba910c..6a917e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# Version 3.1.0 (2020-10-29)
+
+* [chg] Update for SeedStack 20.7
+* [chg] Compatibility with transport client from elasticsearch v2 to v7
+
 # Version 3.0.0 (2017-01-13)
 
 * [brk] Update to new configuration system.
diff --git a/README.md b/README.md
index b1292f2..c335790 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,18 @@
 
 ElasticSearch official persistence integration for SeedStack.
 
+This addon provides a transport client compatible with elasticsearch from v2 to v7.
+
+It has been tested against following elasticsearch servers:
+
+- 2.4.6
+- 5.6.2
+- 6.8.10
+- 7.9.1
+
+Profiles have added in order to help build the addon with various elasticsearch jar versions. 
+By default, Profile v2 is used in travis build configuration. 
+
 # Copyright and license
 
 This source code is copyrighted by [The SeedStack Authors](https://github.com/seedstack/seedstack/blob/master/AUTHORS) and
diff --git a/pom.xml b/pom.xml
index 9d6aa94..e585d18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
+    Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
 
     This Source Code Form is subject to the terms of the Mozilla Public
     License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -14,19 +14,18 @@
     <parent>
         <groupId>org.seedstack.poms</groupId>
         <artifactId>parent-internal</artifactId>
-        <version>3.0.0</version>
+        <version>3.4.9</version>
     </parent>
 
     <groupId>org.seedstack.addons.elasticsearch</groupId>
     <artifactId>elasticsearch</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
 
     <properties>
-        <seed.version>3.0.1</seed.version>
-
+        <seed.version>3.10.0</seed.version>
         <compatibility.skip>true</compatibility.skip>
-
         <bintray.package>elasticsearch-addon</bintray.package>
+        <hibernate-validator.version>6.1.5.Final</hibernate-validator.version>
     </properties>
 
     <build>
@@ -51,6 +50,7 @@
                             <includedLicense>IGNORED_LICENSE</includedLicense>
                         </includedLicenses>
                         <licenseMerges>
+                            <licenseMerge>Apache 2|Apache 2.0</licenseMerge>
                             <licenseMerge>Apache 2|Apache License, Version 2.0</licenseMerge>
                             <licenseMerge>Apache 2|The Apache Software License, Version 2.0</licenseMerge>
                             <licenseMerge>Apache 2|Apache License 2.0</licenseMerge>
@@ -59,6 +59,7 @@
                             <licenseMerge>BSD|The New BSD License</licenseMerge>
                             <licenseMerge>CDDL|CDDL + GPLv2 with classpath exception</licenseMerge>
                             <licenseMerge>LGPL 3.0|GNU Lesser Public License</licenseMerge>
+                            <licenseMerge>MIT License|The MIT License</licenseMerge>
                             <licenseMerge>IGNORED_LICENSE|MPL 1.1</licenseMerge>
                         </licenseMerges>
                     </configuration>
@@ -74,10 +75,14 @@
             <version>${seed.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.elasticsearch</groupId>
-            <artifactId>elasticsearch</artifactId>
-            <version>2.4.3</version>
-            <scope>provided</scope>
+            <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>${hibernate-validator.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>1.26</version>
         </dependency>
 
         <dependency>
@@ -88,10 +93,16 @@
         </dependency>
         <dependency>
             <groupId>org.seedstack.seed</groupId>
-            <artifactId>seed-testing</artifactId>
+            <artifactId>seed-testing-junit4</artifactId>
             <version>${seed.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
@@ -151,5 +162,147 @@
                 </repository>
             </repositories>
         </profile>
+        <profile>
+            <id>v2</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.elasticsearch</groupId>
+                    <artifactId>elasticsearch</artifactId>
+                    <version>2.4.3</version>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>v5</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.elasticsearch</groupId>
+                    <artifactId>elasticsearch</artifactId>
+                    <version>5.6.16</version>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.elasticsearch.client</groupId>
+                    <artifactId>transport</artifactId>
+                    <version>5.6.16</version>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-api</artifactId>
+                    <version>2.11.1</version>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-core</artifactId>
+                    <version>2.11.1</version>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>v60</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.elasticsearch</groupId>
+                    <artifactId>elasticsearch</artifactId>
+                    <version>6.0.1</version>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.elasticsearch.client</groupId>
+                    <artifactId>transport</artifactId>
+                    <version>6.0.1</version>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-api</artifactId>
+                    <version>2.11.1</version>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-core</artifactId>
+                    <version>2.11.1</version>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>v68</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.elasticsearch</groupId>
+                    <artifactId>elasticsearch</artifactId>
+                    <version>6.8.10</version>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.elasticsearch.client</groupId>
+                    <artifactId>transport</artifactId>
+                    <version>6.8.10</version>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-api</artifactId>
+                    <version>2.11.1</version>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-core</artifactId>
+                    <version>2.11.1</version>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>v79</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.elasticsearch</groupId>
+                    <artifactId>elasticsearch</artifactId>
+                    <version>7.9.0</version>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.elasticsearch.client</groupId>
+                    <artifactId>transport</artifactId>
+                    <version>7.9.0</version>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-api</artifactId>
+                    <version>2.11.1</version>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-core</artifactId>
+                    <version>2.11.1</version>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+        </profile>
     </profiles>
 </project>
diff --git a/src/main/java/org/seedstack/elasticsearch/ElasticSearchConfig.java b/src/main/java/org/seedstack/elasticsearch/ElasticSearchConfig.java
index da43c47..9af4560 100644
--- a/src/main/java/org/seedstack/elasticsearch/ElasticSearchConfig.java
+++ b/src/main/java/org/seedstack/elasticsearch/ElasticSearchConfig.java
@@ -1,5 +1,5 @@
-/**
- * Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
+/*
+ * Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchClientProxy.java b/src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchClientProxy.java
index 03aebd8..d4abfca 100644
--- a/src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchClientProxy.java
+++ b/src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchClientProxy.java
@@ -1,5 +1,5 @@
-/**
- * Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
+/*
+ * Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchErrorCode.java b/src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchErrorCode.java
index 1446ac6..5da3dd8 100644
--- a/src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchErrorCode.java
+++ b/src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchErrorCode.java
@@ -1,5 +1,5 @@
-/**
- * Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
+/*
+ * Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -16,5 +16,7 @@ enum ElasticSearchErrorCode implements ErrorCode {
     FORBIDDEN_CLIENT_CLOSE,
     INVALID_HOST,
     INVALID_PORT,
-    CANNOT_CREATE_CLIENT, UNKNOWN_HOST
+    CANNOT_CREATE_CLIENT, UNKNOWN_HOST,
+    NO_TRANSPORT_CLIENT_FOUND,
+    CANNOT_CREATE_ADDRESS;
 }
diff --git a/src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchModule.java b/src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchModule.java
index d131d6f..8f0e1b7 100644
--- a/src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchModule.java
+++ b/src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchModule.java
@@ -1,5 +1,5 @@
-/**
- * Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
+/*
+ * Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchPlugin.java b/src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchPlugin.java
index 5b5908b..641331d 100644
--- a/src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchPlugin.java
+++ b/src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchPlugin.java
@@ -1,5 +1,5 @@
-/**
- * Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
+/*
+ * Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -12,7 +12,6 @@
 import org.elasticsearch.client.Client;
 import org.elasticsearch.client.transport.TransportClient;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.common.transport.InetSocketTransportAddress;
 import org.elasticsearch.plugins.Plugin;
 import org.seedstack.elasticsearch.ElasticSearchConfig;
 import org.seedstack.seed.SeedException;
@@ -24,7 +23,6 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.net.InetAddress;
-import java.net.UnknownHostException;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -83,11 +81,19 @@ public void stop() {
 
     private Client buildRemoteClient(String clientName, ElasticSearchConfig.ClientConfig clientConfig) {
         Settings.Builder settingsBuilder = Settings.builder();
-        settingsBuilder.put(clientConfig.getProperties());
+        for ( Entry<Object, Object> entry: clientConfig.getProperties().entrySet() ) {
+            settingsBuilder.put((String) entry.getKey(), (String) entry.getValue());
+        }
 
-        TransportClient transportClient = Classes.optional("org.elasticsearch.transport.client.PreBuiltTransportClient")
-                .map(preBuiltTransportClientClass -> createV5TransportClient(clientName, clientConfig, settingsBuilder.build()))
-                .orElseGet(() -> createV2TransportClient(clientName, clientConfig, settingsBuilder.build()));
+        TransportClient transportClient = null;
+        if ( Classes.optional("org.elasticsearch.client.transport.TransportClient$Builder").isPresent() )  {
+            transportClient = createV2TransportClient(clientName, clientConfig, settingsBuilder.build());
+        } else if (Classes.optional("org.elasticsearch.transport.client.PreBuiltTransportClient").isPresent() ) {
+            transportClient =  createPreBuiltTransportClient(clientName, clientConfig, settingsBuilder.build());
+        } else {
+            throw SeedException.createNew(ElasticSearchErrorCode.NO_TRANSPORT_CLIENT_FOUND)
+                    .put("clientName", clientName);
+        }
 
         for (String host : clientConfig.getHosts()) {
             String[] hostInfo = host.split(":");
@@ -100,7 +106,7 @@ private Client buildRemoteClient(String clientName, ElasticSearchConfig.ClientCo
             int port = DEFAULT_ELASTIC_SEARCH_PORT;
             try {
                 if (hostInfo.length > 1) {
-                    port = Integer.valueOf(hostInfo[1]);
+                    port = Integer.parseInt(hostInfo[1]);
                 }
             } catch (NumberFormatException e) {
                 throw SeedException.wrap(e, ElasticSearchErrorCode.INVALID_PORT)
@@ -108,12 +114,7 @@ private Client buildRemoteClient(String clientName, ElasticSearchConfig.ClientCo
                         .put("host", host)
                         .put("port", hostInfo[1]);
             }
-            try {
-                transportClient.addTransportAddress(new InetSocketTransportAddress(InetAddress.getByName(address), port));
-            } catch (UnknownHostException e) {
-                throw SeedException.wrap(e, ElasticSearchErrorCode.UNKNOWN_HOST)
-                        .put("host", address);
-            }
+            addTransportAddress(transportClient, address, port);
         }
 
         return transportClient;
@@ -133,10 +134,9 @@ private TransportClient createV2TransportClient(String clientName, ElasticSearch
             throw SeedException.wrap(e, ElasticSearchErrorCode.CANNOT_CREATE_CLIENT)
                     .put("clientName", clientName);
         }
-
     }
 
-    private TransportClient createV5TransportClient(String clientName, ElasticSearchConfig.ClientConfig clientConfig, Settings settings) {
+    private TransportClient createPreBuiltTransportClient(String clientName, ElasticSearchConfig.ClientConfig clientConfig, Settings settings) {
         try {
             Class<?> preBuiltTransportClientClass = Class.forName("org.elasticsearch.transport.client.PreBuiltTransportClient");
             Constructor<?> constructor = preBuiltTransportClientClass.getConstructor(Settings.class, Collection.class);
@@ -146,4 +146,18 @@ private TransportClient createV5TransportClient(String clientName, ElasticSearch
                     .put("clientName", clientName);
         }
     }
+
+    private void addTransportAddress(TransportClient transportClient, String address, int port) throws SeedException {
+        try {
+            Class<?> transportAddressClass = Classes.optional("org.elasticsearch.common.transport.InetSocketTransportAddress")
+            .orElse((Class<Object>) Class.forName("org.elasticsearch.common.transport.TransportAddress"));
+
+            Constructor<?> transportAddressClassConstructor = transportAddressClass.getConstructor(InetAddress.class, Integer.TYPE);
+            Method addTransportAddressMethod = transportClient.getClass().getMethod("addTransportAddress", Class.forName("org.elasticsearch.common.transport.TransportAddress"));
+            addTransportAddressMethod.invoke(transportClient, transportAddressClassConstructor.newInstance(InetAddress.getByName(address), port));
+        } catch (Exception e) {
+                throw SeedException.wrap(e, ElasticSearchErrorCode.CANNOT_CREATE_ADDRESS)
+                        .put("AddressType", "InetSocketTransportAddress");
+        }
+    }
 }
diff --git a/src/main/resources/org/seedstack/elasticsearch/ElasticSearchConfig.properties b/src/main/resources/org/seedstack/elasticsearch/ElasticSearchConfig.properties
index 3adac0f..731c37c 100644
--- a/src/main/resources/org/seedstack/elasticsearch/ElasticSearchConfig.properties
+++ b/src/main/resources/org/seedstack/elasticsearch/ElasticSearchConfig.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
+# Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/main/resources/org/seedstack/elasticsearch/internal/ElasticSearchErrorCode.properties b/src/main/resources/org/seedstack/elasticsearch/internal/ElasticSearchErrorCode.properties
index 5044178..57ebe25 100644
--- a/src/main/resources/org/seedstack/elasticsearch/internal/ElasticSearchErrorCode.properties
+++ b/src/main/resources/org/seedstack/elasticsearch/internal/ElasticSearchErrorCode.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
+# Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/it/java/org/seedstack/elasticsearch/ElasticSearchIT.java b/src/test/java/org/seedstack/elasticsearch/ElasticSearchIT.java
similarity index 90%
rename from src/it/java/org/seedstack/elasticsearch/ElasticSearchIT.java
rename to src/test/java/org/seedstack/elasticsearch/ElasticSearchIT.java
index f1e0856..ddd0f3a 100644
--- a/src/it/java/org/seedstack/elasticsearch/ElasticSearchIT.java
+++ b/src/test/java/org/seedstack/elasticsearch/ElasticSearchIT.java
@@ -1,5 +1,5 @@
-/**
- * Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
+/*
+ * Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -14,8 +14,9 @@
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.json.JSONException;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.seedstack.seed.SeedException;
-import org.seedstack.seed.it.AbstractSeedIT;
+import org.seedstack.seed.testing.junit4.SeedITRunner;
 import org.skyscreamer.jsonassert.JSONAssert;
 
 import javax.inject.Inject;
@@ -25,7 +26,8 @@
 
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
 
-public class ElasticSearchIT extends AbstractSeedIT {
+@RunWith(SeedITRunner.class)
+public class ElasticSearchIT {
     @Inject
     @Named("client1")
     Client remoteClient;
diff --git a/src/it/resources/application.yaml b/src/test/resources/application.yaml
similarity index 77%
rename from src/it/resources/application.yaml
rename to src/test/resources/application.yaml
index 33a69fb..4e941fd 100644
--- a/src/it/resources/application.yaml
+++ b/src/test/resources/application.yaml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
+# Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this