diff --git a/.codeclimate.yml b/.codeclimate.yml
new file mode 100644
index 0000000..f3c2a9b
--- /dev/null
+++ b/.codeclimate.yml
@@ -0,0 +1,7 @@
+---
+engines:
+  fixme:
+    enabled: true
+ratings:
+  paths: []
+exclude_paths: []
diff --git a/.travis.yml b/.travis.yml
index b1d3871..c7c4791 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,38 @@
 sudo: false
 
+addons:
+  code_climate:
+    repo_token: 41ade8a62a381902d310cdec48fbc15ffc35b5a2ab4fb9b5b20068da1fdbf874
+
 language: java
 
+jdk:
+  - openjdk7
+
+install:
+  - ./gradlew --version
+
 script:
-  - gradle jar
-  - gradle shadowJar
+  - ./gradlew test
+  - ./gradlew jar
+  - ./gradlew shadowJar
 
 after_success:
-  - coveralls
+  - ./gradlew coveralls
 
 notifications:
   email: false
 
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+
+cache:
+  directories:
+    - $HOME/.m2/
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/
+
 deploy:
   provider: releases
   skip_cleanup: true
diff --git a/build.gradle b/build.gradle
index 72aeac2..4165901 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,14 @@
 plugins {
-  id 'java'
-  id 'com.github.johnrengelman.shadow' version '1.2.3'
+  id 'findbugs'
+  id 'pmd'
+  id 'jdepend'
+  id "com.github.johnrengelman.shadow" version "1.2.4"
   id 'net.saliman.cobertura' version '2.3.1'
-  id 'com.github.kt3k.coveralls' version '2.6.3'
+  id 'com.github.kt3k.coveralls' version '2.7.1'
+  id 'com.github.ben-manes.versions' version '0.13.0'
 }
 
-version = '1.2.2'
+version = '1.2.3'
 group = 'lt.nkts'
 
 sourceCompatibility = 1.6
@@ -15,10 +18,13 @@ repositories {
   jcenter()
 }
 
+project.ext.cassversion = '3.9'
+
 dependencies {
-  compile 'org.apache.cassandra:cassandra-all:3.7'
+  compile "org.apache.cassandra:cassandra-all:${cassversion}"
   compile 'com.ecwid.consul:consul-api:1.1.9'
   compile 'org.apache.commons:commons-collections4:4.0'
+  compile 'org.kie.modules:org-apache-commons-lang3:6.5.0.Final'
   compile 'com.google.guava:guava:19.0'
 }
 
@@ -37,3 +43,24 @@ configurations {
 }
 
 cobertura.coverageFormats = ['html', 'xml']
+
+task wrapper(type: Wrapper) {
+  gradleVersion = '3.2'
+}
+
+findbugsMain {
+  ignoreFailures = true
+  effort = "max"
+  reports {
+    xml.enabled = true
+    html.enabled = false
+  }
+}
+
+pmd {
+  ignoreFailures = true
+}
+
+tasks.coveralls {
+  dependsOn 'check', 'cobertura'
+}
diff --git a/gradle/wrapper/.gitignore b/gradle/wrapper/.gitignore
new file mode 100644
index 0000000..6bfddf5
--- /dev/null
+++ b/gradle/wrapper/.gitignore
@@ -0,0 +1 @@
+!gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..6ffa237
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..881b50c
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Fri Nov 18 05:18:23 GMT 2016
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-bin.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..9aa616c
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,169 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..e95643d
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/readme.md b/readme.md
index 771d0fe..8e7d97e 100644
--- a/readme.md
+++ b/readme.md
@@ -1,10 +1,17 @@
+### Status
+[![Build Status](https://travis-ci.org/nkts/cassandra-consul-seed-provider.svg?branch=master)](https://travis-ci.org/nkts/cassandra-consul-seed-provider)
+[![Code Climate](https://codeclimate.com/github/nkts/cassandra-consul-seed-provider/badges/gpa.svg)](https://codeclimate.com/github/nkts/cassandra-consul-seed-provider)
+[![Test Coverage](https://codeclimate.com/github/nkts/cassandra-consul-seed-provider/badges/coverage.svg)](https://codeclimate.com/github/nkts/cassandra-consul-seed-provider/coverage)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/38b51df63b5f4be8ad638e440c5bccb1)](https://www.codacy.com/app/marius-karnauskas/cassandra-consul-seed-provider?utm_source=github.com&utm_medium=referral&utm_content=nkts/cassandra-consul-seed-provider&utm_campaign=Badge_Grade)
+[![Coverage Status](https://coveralls.io/repos/github/nkts/cassandra-consul-seed-provider/badge.svg?branch=dynamic_version)](https://coveralls.io/github/nkts/cassandra-consul-seed-provider?branch=dynamic_version)
+
 ### Build
 
 Before building, make sure that the Cassandra dependency version matches your version :
 
 	compile 'org.apache.cassandra:cassandra-all:3.7'
 
-Then build: 
+Then build:
 
     gradle shadowJar
     gradle jar
diff --git a/src/main/java/lt/nkts/cassandra/ConsulSeedProvider.java b/src/main/java/lt/nkts/cassandra/ConsulSeedProvider.java
index 1e96047..7a00485 100644
--- a/src/main/java/lt/nkts/cassandra/ConsulSeedProvider.java
+++ b/src/main/java/lt/nkts/cassandra/ConsulSeedProvider.java
@@ -20,8 +20,6 @@ public class ConsulSeedProvider implements SeedProvider {
 
     private static final Logger logger = LoggerFactory.getLogger(ConsulSeedProvider.class);
 
-    private ConsulClient client;
-
     private URL consul_url;
     private Boolean consul_use_kv;
     private String consul_kv_prefix;
@@ -66,7 +64,7 @@ public ConsulSeedProvider(Map<String, String> args) {
     }
 
     public List<InetAddress> getSeeds() {
-        client = new ConsulClient(String.format("%s:%s", consul_url.getHost(), consul_url.getPort()));
+        ConsulClient client = new ConsulClient(String.format("%s:%s", consul_url.getHost(), consul_url.getPort()));
 
         List<InetAddress> seeds = new ArrayList<InetAddress>();