diff --git a/.gitignore b/.gitignore
index 2af9c85f..b64f2292 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,9 @@
 .DS_Store
 ATMobileAnalytics/TestApp/src/main/assets/
 ATMobileAnalytics/TestApp/TestApp.iml
-ATMobileAnalytics/Tracker/Tracker.iml
\ No newline at end of file
+ATMobileAnalytics/Tracker/Tracker.iml
+ATMobileAnalytics/.gradle
+ATMobileAnalytics/local.properties
+ATMobileAnalytics/.DS_Store
+ATMobileAnalytics/build
+ATMobileAnalytics/.idea/
\ No newline at end of file
diff --git a/ATMobileAnalytics/.gitignore b/ATMobileAnalytics/.gitignore
deleted file mode 100644
index 2aeff34d..00000000
--- a/ATMobileAnalytics/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.gradle
-/local.properties
-.DS_Store
-/build
-.idea/
diff --git a/ATMobileAnalytics/.idea/.name b/ATMobileAnalytics/.idea/.name
deleted file mode 100644
index 627dbf0d..00000000
--- a/ATMobileAnalytics/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-ATMobileAnalytics
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/.zip b/ATMobileAnalytics/.idea/.zip
deleted file mode 100644
index 8d83c883..00000000
Binary files a/ATMobileAnalytics/.idea/.zip and /dev/null differ
diff --git a/ATMobileAnalytics/.idea/compiler.xml b/ATMobileAnalytics/.idea/compiler.xml
deleted file mode 100644
index 217af471..00000000
--- a/ATMobileAnalytics/.idea/compiler.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>
-
diff --git a/ATMobileAnalytics/.idea/copyright/profiles_settings.xml b/ATMobileAnalytics/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf33..00000000
--- a/ATMobileAnalytics/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/dictionaries/nsagnette.xml b/ATMobileAnalytics/.idea/dictionaries/nsagnette.xml
deleted file mode 100644
index 4760a1d3..00000000
--- a/ATMobileAnalytics/.idea/dictionaries/nsagnette.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="nsagnette">
-    <words>
-      <w>&amp;int</w>
-      <w>&amp;lng</w>
-      <w>&amp;map</w>
-      <w>&amp;olt</w>
-      <w>&amp;ref</w>
-      <w>&amp;stc</w>
-      <w>après</w>
-      <w>apvr</w>
-      <w>atinternet</w>
-      <w>bandroid</w>
-      <w>bgoogle</w>
-      <w>bluray</w>
-      <w>bnexus</w>
-      <w>booleen</w>
-      <w>c'est</w>
-      <w>chaine</w>
-      <w>classname</w>
-      <w>concaténée</w>
-      <w>concaténés</w>
-      <w>connaitre</w>
-      <w>création</w>
-      <w>crée</w>
-      <w>créer</w>
-      <w>créé</w>
-      <w>d'encodage</w>
-      <w>d'options</w>
-      <w>d'un</w>
-      <w>d'une</w>
-      <w>d'éviter</w>
-      <w>demandé</w>
-      <w>différents</w>
-      <w>doffline</w>
-      <w>domaintest</w>
-      <w>dsfl</w>
-      <w>dslu</w>
-      <w>dwww</w>
-      <w>début</w>
-      <w>découpable</w>
-      <w>découpe</w>
-      <w>défaut</w>
-      <w>défini</w>
-      <w>définie</w>
-      <w>désiré</w>
-      <w>développement</w>
-      <w>développeur</w>
-      <w>ecrase</w>
-      <w>enumération</w>
-      <w>envoyé</w>
-      <w>flau</w>
-      <w>formattage</w>
-      <w>fourg</w>
-      <w>gbugniot</w>
-      <w>gprs</w>
-      <w>grâce</w>
-      <w>hh'x</w>
-      <w>idclient</w>
-      <w>ifld</w>
-      <w>iflm</w>
-      <w>iflw</w>
-      <w>initialisés</w>
-      <w>inutilisé</w>
-      <w>jevaisbientoutvabien</w>
-      <w>l'ancienne</w>
-      <w>l'application</w>
-      <w>l'encodage</w>
-      <w>l'endroit</w>
-      <w>l'entité</w>
-      <w>l'envoi</w>
-      <w>l'idclient</w>
-      <w>l'interface</w>
-      <w>l'objet</w>
-      <w>lalala</w>
-      <w>lastscreen</w>
-      <w>lcsu</w>
-      <w>libération</w>
-      <w>logp</w>
-      <w>lève</w>
-      <w>mfmd</w>
-      <w>mherr</w>
-      <w>mhid</w>
-      <w>mm'x</w>
-      <w>multihits</w>
-      <w>myyyy</w>
-      <w>méthode</w>
-      <w>n'est</w>
-      <w>nuggad</w>
-      <w>outerloop</w>
-      <w>paramètre</w>
-      <w>paramètres</w>
-      <w>paramétrée</w>
-      <w>passée</w>
-      <w>pdtl</w>
-      <w>pixelpath</w>
-      <w>podcast</w>
-      <w>possède</w>
-      <w>privé</w>
-      <w>privée</w>
-      <w>préparation</w>
-      <w>présente</w>
-      <w>présentes</w>
-      <w>ptag</w>
-      <w>publicite</w>
-      <w>qu'une</w>
-      <w>querystring</w>
-      <w>recvfrom</w>
-      <w>redirections</w>
-      <w>redéfinie</w>
-      <w>refconfigchunks</w>
-      <w>refkey</w>
-      <w>renseigné</w>
-      <w>renseignées</w>
-      <w>requête</w>
-      <w>reçu</w>
-      <w>runnables</w>
-      <w>réception</w>
-      <w>récupère</w>
-      <w>récupération</w>
-      <w>référence</w>
-      <w>réponse</w>
-      <w>réussi</w>
-      <w>réutiliser</w>
-      <w>s'agissait</w>
-      <w>s'agit</w>
-      <w>s'il</w>
-      <w>smartphone</w>
-      <w>stockés</w>
-      <w>storageduration</w>
-      <w>subhits</w>
-      <w>surchargée</w>
-      <w>séparateur</w>
-      <w>threeg</w>
-      <w>threegplus</w>
-      <w>totalité</w>
-      <w>tronçon</w>
-      <w>tronçons</w>
-      <w>trouvé</w>
-      <w>tvtracking</w>
-      <w>twog</w>
-      <w>téléphone</w>
-      <w>verifie</w>
-      <w>verybigkey</w>
-      <w>verybigvalue</w>
-      <w>vmid</w>
-      <w>vpost</w>
-      <w>vpre</w>
-      <w>vtag</w>
-      <w>vérifie</w>
-      <w>weborama</w>
-      <w>webview</w>
-      <w>xiti</w>
-      <w>yyyy</w>
-      <w>yyyydd</w>
-      <w>écrase</w>
-      <w>éléments</w>
-      <w>éviter</w>
-      <w>être</w>
-    </words>
-  </dictionary>
-</component>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/encodings.xml b/ATMobileAnalytics/.idea/encodings.xml
deleted file mode 100644
index f7589596..00000000
--- a/ATMobileAnalytics/.idea/encodings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/gradle.xml b/ATMobileAnalytics/.idea/gradle.xml
deleted file mode 100644
index 394d6638..00000000
--- a/ATMobileAnalytics/.idea/gradle.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.10" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/TestApp" />
-            <option value="$PROJECT_DIR$/Tracker" />
-          </set>
-        </option>
-        <option name="myModules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/TestApp" />
-            <option value="$PROJECT_DIR$/Tracker" />
-          </set>
-        </option>
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/inspectionProfiles/Project_Default.xml b/ATMobileAnalytics/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 4ea1fabe..00000000
--- a/ATMobileAnalytics/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-    <option name="myLocal" value="false" />
-    <inspection_tool class="AndroidLintUseValueOf" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="AndroidLintWrongViewCast" enabled="false" level="ERROR" enabled_by_default="false" />
-    <inspection_tool class="Annotator" enabled="false" level="ERROR" enabled_by_default="false" />
-    <inspection_tool class="IgnoreResultOfCall" enabled="false" level="WARNING" enabled_by_default="false">
-      <option name="m_reportAllNonLibraryCalls" value="false" />
-      <option name="callCheckString" value="java.io.File,.*,java.io.InputStream,read|skip|available|markSupported,java.io.Writer,read|skip|ready|markSupported,java.lang.Boolean,.*,java.lang.Byte,.*,java.lang.Character,.*,java.lang.Double,.*,java.lang.Float,.*,java.lang.Integer,.*,java.lang.Long,.*,java.lang.Math,.*,java.lang.Object,equals|hashCode|toString,java.lang.Short,.*,java.lang.StrictMath,.*,java.lang.String,.*,java.math.BigInteger,.*,java.math.BigDecimal,.*,java.net.InetAddress,.*,java.net.URI,.*,java.util.UUID,.*,java.util.regex.Matcher,pattern|toMatchResult|start|end|group|groupCount|matches|find|lookingAt|quoteReplacement|replaceAll|replaceFirst|regionStart|regionEnd|hasTransparantBounds|hasAnchoringBounds|hitEnd|requireEnd,java.util.regex.Pattern,.*" />
-    </inspection_tool>
-    <inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false">
-      <option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
-      <option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />
-    </inspection_tool>
-    <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
-      <option name="processCode" value="true" />
-      <option name="processLiterals" value="true" />
-      <option name="processComments" value="true" />
-    </inspection_tool>
-    <inspection_tool class="UNCHECKED_WARNING" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="UnusedAssignment" enabled="false" level="WARNING" enabled_by_default="false">
-      <option name="REPORT_PREFIX_EXPRESSIONS" value="false" />
-      <option name="REPORT_POSTFIX_EXPRESSIONS" value="true" />
-      <option name="REPORT_REDUNDANT_INITIALIZER" value="true" />
-    </inspection_tool>
-  </profile>
-</component>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/inspectionProfiles/profiles_settings.xml b/ATMobileAnalytics/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 3b312839..00000000
--- a/ATMobileAnalytics/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="PROJECT_PROFILE" value="Project Default" />
-    <option name="USE_PROJECT_PROFILE" value="true" />
-    <version value="1.0" />
-  </settings>
-</component>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/libraries/ATInternet.xml b/ATMobileAnalytics/.idea/libraries/ATInternet.xml
deleted file mode 100644
index e36344a0..00000000
--- a/ATMobileAnalytics/.idea/libraries/ATInternet.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="ATInternet">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/TestApp/libs/ATInternet.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/libraries/ant_1_8_0.xml b/ATMobileAnalytics/.idea/libraries/ant_1_8_0.xml
deleted file mode 100644
index 07bc4046..00000000
--- a/ATMobileAnalytics/.idea/libraries/ant_1_8_0.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="ant-1.8.0">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.8.0/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/ant-1.8.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.8.0/2e585348c06d55d4c27c4afe46721fd5d6a43d9d/ant-1.8.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/libraries/ant_launcher_1_8_0.xml b/ATMobileAnalytics/.idea/libraries/ant_launcher_1_8_0.xml
deleted file mode 100644
index 2dce35f4..00000000
--- a/ATMobileAnalytics/.idea/libraries/ant_launcher_1_8_0.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="ant-launcher-1.8.0">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.8.0/8b53ba16fa62fb1034da8f1de200ddc407c8381/ant-launcher-1.8.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/libraries/appcompat_v7_22_2_1.xml b/ATMobileAnalytics/.idea/libraries/appcompat_v7_22_2_1.xml
deleted file mode 100644
index 76c93929..00000000
--- a/ATMobileAnalytics/.idea/libraries/appcompat_v7_22_2_1.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="appcompat-v7-22.2.1">
-    <CLASSES>
-      <root url="file://$PROJECT_DIR$/TestApp/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.1/res" />
-      <root url="jar://$PROJECT_DIR$/TestApp/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.1/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/appcompat-v7/22.2.1/appcompat-v7-22.2.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/libraries/asm_5_0_1.xml b/ATMobileAnalytics/.idea/libraries/asm_5_0_1.xml
deleted file mode 100644
index 283ec5c7..00000000
--- a/ATMobileAnalytics/.idea/libraries/asm_5_0_1.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="asm-5.0.1">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm/5.0.1/2fd56467a018aafe6ec6a73ccba520be4a7e1565/asm-5.0.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm/5.0.1/78ebb2694324283f3120aa3ed52465b22fab8a4a/asm-5.0.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/libraries/asm_analysis_5_0_1.xml b/ATMobileAnalytics/.idea/libraries/asm_analysis_5_0_1.xml
deleted file mode 100644
index 6d8c202c..00000000
--- a/ATMobileAnalytics/.idea/libraries/asm_analysis_5_0_1.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="asm-analysis-5.0.1">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-analysis/5.0.1/e286fbee48efacb4e7c175f7948d9d8b2ab52352/asm-analysis-5.0.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-analysis/5.0.1/78ebb2694324283f3120aa3ed52465b22fab8a4a/asm-analysis-5.0.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/libraries/asm_commons_5_0_1.xml b/ATMobileAnalytics/.idea/libraries/asm_commons_5_0_1.xml
deleted file mode 100644
index dc61cb1d..00000000
--- a/ATMobileAnalytics/.idea/libraries/asm_commons_5_0_1.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="asm-commons-5.0.1">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-commons/5.0.1/7b7147a390a93a14d2edfdcf3f7b0e87a0939c3e/asm-commons-5.0.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-commons/5.0.1/78ebb2694324283f3120aa3ed52465b22fab8a4a/asm-commons-5.0.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/libraries/asm_tree_5_0_1.xml b/ATMobileAnalytics/.idea/libraries/asm_tree_5_0_1.xml
deleted file mode 100644
index cb7a1e85..00000000
--- a/ATMobileAnalytics/.idea/libraries/asm_tree_5_0_1.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="asm-tree-5.0.1">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-tree/5.0.1/1b1e6e9d869acd704056d0a4223071a511c619e6/asm-tree-5.0.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-tree/5.0.1/78ebb2694324283f3120aa3ed52465b22fab8a4a/asm-tree-5.0.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/libraries/asm_util_5_0_1.xml b/ATMobileAnalytics/.idea/libraries/asm_util_5_0_1.xml
deleted file mode 100644
index e07f4ed4..00000000
--- a/ATMobileAnalytics/.idea/libraries/asm_util_5_0_1.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="asm-util-5.0.1">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-util/5.0.1/7c8caddfbd0b2d7b844f8fcc75175b9cb9cf4724/asm-util-5.0.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-util/5.0.1/78ebb2694324283f3120aa3ed52465b22fab8a4a/asm-util-5.0.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/libraries/commons_codec_1_3.xml b/ATMobileAnalytics/.idea/libraries/commons_codec_1_3.xml
deleted file mode 100644
index 5f26ce43..00000000
--- a/ATMobileAnalytics/.idea/libraries/commons_codec_1_3.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="commons-codec-1.3">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.3/fd32786786e2adb664d5ecc965da47629dca14ba/commons-codec-1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/libraries/hamcrest_core_1_1.xml b/ATMobileAnalytics/.idea/libraries/hamcrest_core_1_1.xml
deleted file mode 100644
index 04e0cdc6..00000000
--- a/ATMobileAnalytics/.idea/libraries/hamcrest_core_1_1.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="hamcrest-core-1.1">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.1/860340562250678d1a344907ac75754e259cdb14/hamcrest-core-1.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.1/2ccf1154d1a8936042a8a742dc3e611d02ac7213/hamcrest-core-1.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/libraries/junit_4_10.xml b/ATMobileAnalytics/.idea/libraries/junit_4_10.xml
deleted file mode 100644
index 6919e711..00000000
--- a/ATMobileAnalytics/.idea/libraries/junit_4_10.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="junit-4.10">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.10/e4f1766ce7404a08f45d859fb9c226fc9e41a861/junit-4.10.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.10/6c98d6766e72d5575f96c9479d1c1d3b865c6e25/junit-4.10-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/libraries/maven_ant_tasks_2_1_3.xml b/ATMobileAnalytics/.idea/libraries/maven_ant_tasks_2_1_3.xml
deleted file mode 100644
index 22fe7625..00000000
--- a/ATMobileAnalytics/.idea/libraries/maven_ant_tasks_2_1_3.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="maven-ant-tasks-2.1.3">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-ant-tasks/2.1.3/b09be554228d66d208e5fef5266844aacf443abc/maven-ant-tasks-2.1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-ant-tasks/2.1.3/49136cf7eb0e463e080ad2ebb0f65e91b19c8101/maven-ant-tasks-2.1.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/libraries/objenesis_1_3.xml b/ATMobileAnalytics/.idea/libraries/objenesis_1_3.xml
deleted file mode 100644
index 80d4fd62..00000000
--- a/ATMobileAnalytics/.idea/libraries/objenesis_1_3.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="objenesis-1.3">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.objenesis/objenesis/1.3/dc13ae4faca6df981fc7aeb5a522d9db446d5d50/objenesis-1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/libraries/play_services_ads_8_1_0.xml b/ATMobileAnalytics/.idea/libraries/play_services_ads_8_1_0.xml
deleted file mode 100644
index ff34ee8c..00000000
--- a/ATMobileAnalytics/.idea/libraries/play_services_ads_8_1_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="play-services-ads-8.1.0">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/Tracker/build/intermediates/exploded-aar/com.google.android.gms/play-services-ads/8.1.0/classes.jar!/" />
-      <root url="file://$PROJECT_DIR$/Tracker/build/intermediates/exploded-aar/com.google.android.gms/play-services-ads/8.1.0/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/libraries/play_services_ads_8_4_0.xml b/ATMobileAnalytics/.idea/libraries/play_services_ads_8_4_0.xml
deleted file mode 100644
index fea6a29c..00000000
--- a/ATMobileAnalytics/.idea/libraries/play_services_ads_8_4_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="play-services-ads-8.4.0">
-    <CLASSES>
-      <root url="file://$PROJECT_DIR$/Tracker/build/intermediates/exploded-aar/com.google.android.gms/play-services-ads/8.4.0/res" />
-      <root url="jar://$PROJECT_DIR$/Tracker/build/intermediates/exploded-aar/com.google.android.gms/play-services-ads/8.4.0/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/libraries/play_services_appindexing_8_1_0.xml b/ATMobileAnalytics/.idea/libraries/play_services_appindexing_8_1_0.xml
deleted file mode 100644
index 3b35f3ed..00000000
--- a/ATMobileAnalytics/.idea/libraries/play_services_appindexing_8_1_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="play-services-appindexing-8.1.0">
-    <CLASSES>
-      <root url="file://$PROJECT_DIR$/Tracker/build/intermediates/exploded-aar/com.google.android.gms/play-services-appindexing/8.1.0/res" />
-      <root url="jar://$PROJECT_DIR$/Tracker/build/intermediates/exploded-aar/com.google.android.gms/play-services-appindexing/8.1.0/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/libraries/play_services_basement_8_1_0.xml b/ATMobileAnalytics/.idea/libraries/play_services_basement_8_1_0.xml
deleted file mode 100644
index cc774df5..00000000
--- a/ATMobileAnalytics/.idea/libraries/play_services_basement_8_1_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="play-services-basement-8.1.0">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/Tracker/build/intermediates/exploded-aar/com.google.android.gms/play-services-basement/8.1.0/classes.jar!/" />
-      <root url="file://$PROJECT_DIR$/Tracker/build/intermediates/exploded-aar/com.google.android.gms/play-services-basement/8.1.0/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/libraries/play_services_basement_8_4_0.xml b/ATMobileAnalytics/.idea/libraries/play_services_basement_8_4_0.xml
deleted file mode 100644
index e8bab501..00000000
--- a/ATMobileAnalytics/.idea/libraries/play_services_basement_8_4_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="play-services-basement-8.4.0">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/Tracker/build/intermediates/exploded-aar/com.google.android.gms/play-services-basement/8.4.0/classes.jar!/" />
-      <root url="file://$PROJECT_DIR$/Tracker/build/intermediates/exploded-aar/com.google.android.gms/play-services-basement/8.4.0/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/libraries/robolectric_2_4.xml b/ATMobileAnalytics/.idea/libraries/robolectric_2_4.xml
deleted file mode 100644
index 1904b613..00000000
--- a/ATMobileAnalytics/.idea/libraries/robolectric_2_4.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="robolectric-2.4">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.robolectric/robolectric/2.4/5b3e395f0e422de3147d42918b7a5b08476f2377/robolectric-2.4.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/libraries/robolectric_annotations_2_4.xml b/ATMobileAnalytics/.idea/libraries/robolectric_annotations_2_4.xml
deleted file mode 100644
index 5d988fff..00000000
--- a/ATMobileAnalytics/.idea/libraries/robolectric_annotations_2_4.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="robolectric-annotations-2.4">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.robolectric/robolectric-annotations/2.4/936c649cb0958d7fb5d3c09b31c56b3997f80650/robolectric-annotations-2.4.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/libraries/sqlite4java_0_282.xml b/ATMobileAnalytics/.idea/libraries/sqlite4java_0_282.xml
deleted file mode 100644
index 8866bc2d..00000000
--- a/ATMobileAnalytics/.idea/libraries/sqlite4java_0_282.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="sqlite4java-0.282">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.almworks.sqlite4java/sqlite4java/0.282/745a7e2f35fdbe6336922e0d492c979dbbfa74fb/sqlite4java-0.282.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.almworks.sqlite4java/sqlite4java/0.282/8058566a195c0f19ddaf9e2162138bdcb43712e1/sqlite4java-0.282-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/libraries/support_annotations_22_2_0.xml b/ATMobileAnalytics/.idea/libraries/support_annotations_22_2_0.xml
deleted file mode 100644
index 4cc0d937..00000000
--- a/ATMobileAnalytics/.idea/libraries/support_annotations_22_2_0.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="support-annotations-22.2.0">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/22.2.0/support-annotations-22.2.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/22.2.0/support-annotations-22.2.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/libraries/support_annotations_22_2_1.xml b/ATMobileAnalytics/.idea/libraries/support_annotations_22_2_1.xml
deleted file mode 100644
index 578e0ab2..00000000
--- a/ATMobileAnalytics/.idea/libraries/support_annotations_22_2_1.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="support-annotations-22.2.1">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/22.2.1/support-annotations-22.2.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/22.2.1/support-annotations-22.2.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/libraries/support_annotations_23_0_0.xml b/ATMobileAnalytics/.idea/libraries/support_annotations_23_0_0.xml
deleted file mode 100644
index 8a45179e..00000000
--- a/ATMobileAnalytics/.idea/libraries/support_annotations_23_0_0.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="support-annotations-23.0.0">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/23.0.0/support-annotations-23.0.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/23.0.0/support-annotations-23.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/libraries/support_v4_22_2_0.xml b/ATMobileAnalytics/.idea/libraries/support_v4_22_2_0.xml
deleted file mode 100644
index c0ab5a0d..00000000
--- a/ATMobileAnalytics/.idea/libraries/support_v4_22_2_0.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<component name="libraryTable">
-  <library name="support-v4-22.2.0">
-    <ANNOTATIONS>
-      <root url="jar://$PROJECT_DIR$/Tracker/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/Tracker/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/classes.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Tracker/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/libs/internal_impl-22.2.0.jar!/" />
-      <root url="file://$PROJECT_DIR$/Tracker/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-v4/22.2.0/support-v4-22.2.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/libraries/support_v4_22_2_1.xml b/ATMobileAnalytics/.idea/libraries/support_v4_22_2_1.xml
deleted file mode 100644
index ef157718..00000000
--- a/ATMobileAnalytics/.idea/libraries/support_v4_22_2_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="support-v4-22.2.1">
-    <CLASSES>
-      <root url="file://$PROJECT_DIR$/TestApp/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.1/res" />
-      <root url="jar://$PROJECT_DIR$/TestApp/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.1/classes.jar!/" />
-      <root url="jar://$PROJECT_DIR$/TestApp/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.1/libs/internal_impl-22.2.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-v4/22.2.1/support-v4-22.2.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/libraries/support_v4_23_0_0.xml b/ATMobileAnalytics/.idea/libraries/support_v4_23_0_0.xml
deleted file mode 100644
index 405e0bf4..00000000
--- a/ATMobileAnalytics/.idea/libraries/support_v4_23_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="support-v4-23.0.0">
-    <CLASSES>
-      <root url="file://$PROJECT_DIR$/Tracker/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.0/res" />
-      <root url="jar://$PROJECT_DIR$/Tracker/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.0/libs/internal_impl-23.0.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Tracker/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.0/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-v4/23.0.0/support-v4-23.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/libraries/vtd_xml_2_11.xml b/ATMobileAnalytics/.idea/libraries/vtd_xml_2_11.xml
deleted file mode 100644
index fe8507f3..00000000
--- a/ATMobileAnalytics/.idea/libraries/vtd_xml_2_11.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="vtd-xml-2.11">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.ximpleware/vtd-xml/2.11/ee5bcf62c1acf76434ee9f1c67a840bafef72a6d/vtd-xml-2.11.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.ximpleware/vtd-xml/2.11/fa2dcbbe7f3bf99312efc0a010d8aa97f0f5779e/vtd-xml-2.11-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/modules.xml b/ATMobileAnalytics/.idea/modules.xml
deleted file mode 100644
index 26be27a0..00000000
--- a/ATMobileAnalytics/.idea/modules.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/ATMobileAnalytics.iml" filepath="$PROJECT_DIR$/ATMobileAnalytics.iml" />
-      <module fileurl="file://$PROJECT_DIR$/TestApp/TestApp.iml" filepath="$PROJECT_DIR$/TestApp/TestApp.iml" />
-      <module fileurl="file://$PROJECT_DIR$/Tracker/Tracker.iml" filepath="$PROJECT_DIR$/Tracker/Tracker.iml" />
-    </modules>
-  </component>
-</project>
-
diff --git a/ATMobileAnalytics/.idea/runConfigurations.xml b/ATMobileAnalytics/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460d..00000000
--- a/ATMobileAnalytics/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/scopes/scope_settings.xml b/ATMobileAnalytics/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b8..00000000
--- a/ATMobileAnalytics/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/ATMobileAnalytics/.idea/vcs.xml b/ATMobileAnalytics/.idea/vcs.xml
deleted file mode 100644
index 21cbaa60..00000000
--- a/ATMobileAnalytics/.idea/vcs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>
-
diff --git a/ATMobileAnalytics/.idea/workspace.xml b/ATMobileAnalytics/.idea/workspace.xml
index ef7d6802..7a34dc8a 100644
--- a/ATMobileAnalytics/.idea/workspace.xml
+++ b/ATMobileAnalytics/.idea/workspace.xml
@@ -7,32 +7,114 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="5fd7fdf2-db46-4622-95d9-7515ac863253" name="Default" comment="">
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.gitignore" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/.name" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/.zip" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/compiler.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/copyright/profiles_settings.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/dictionaries/nsagnette.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/encodings.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/gradle.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/profiles_settings.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/ATInternet.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/ant_1_8_0.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/ant_launcher_1_8_0.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/appcompat_v7_22_2_1.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/asm_5_0_1.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/asm_analysis_5_0_1.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/asm_commons_5_0_1.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/asm_tree_5_0_1.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/asm_util_5_0_1.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/commons_codec_1_3.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/hamcrest_core_1_1.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/junit_4_10.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/maven_ant_tasks_2_1_3.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/objenesis_1_3.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_ads_8_1_0.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_ads_8_4_0.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_appindexing_8_1_0.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_basement_8_1_0.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_basement_8_4_0.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/robolectric_2_4.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/robolectric_annotations_2_4.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/sqlite4java_0_282.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/support_annotations_22_2_0.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/support_annotations_22_2_1.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/support_annotations_23_0_0.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/support_v4_22_2_0.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/support_v4_22_2_1.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/support_v4_23_0_0.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/vtd_xml_2_11.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/modules.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/runConfigurations.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/scopes/scope_settings.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/vcs.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/TestApp/.gitignore" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/TestApp/libs/ATInternet.jar" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/TestApp/src/androidTest/java/com/atinternet/ApplicationTest.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/TestApp/src/main/java/com/atinternet/FirstScreenActivity.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/TestApp/src/main/java/com/atinternet/SecondScreenActivity.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/TestApp/src/main/java/com/atinternet/TestAppClass.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/TestApp/src/main/res/drawable-hdpi/ic_launcher.png" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/TestApp/src/main/res/drawable-mdpi/ic_launcher.png" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/TestApp/src/main/res/drawable-xhdpi/ic_launcher.png" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/TestApp/src/main/res/drawable-xxhdpi/ic_launcher.png" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/TestApp/src/main/res/layout/main_layout.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/TestApp/src/main/res/layout/second_layout.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/TestApp/src/main/res/values-v21/styles.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/TestApp/src/main/res/values/array.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/Tracker/sonar-project.properties" afterPath="" />
       <change type="DELETED" beforePath="$PROJECT_DIR$/Tracker/src/main/assets/defaultConfiguration.json" afterPath="" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/gradle.xml" afterPath="$PROJECT_DIR$/.idea/gradle.xml" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/Buffer.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/Builder.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/BusinessObject.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/Closure.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/CrashDetectionHandler.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/Dispatcher.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/Helper.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/LifeCycle.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/Lists.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/OrderCustomVar.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/Param.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/PluginParam.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/ScreenInfo.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/Sender.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/Storage.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/TVTrackingPlugin.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/TechnicalContext.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/Tool.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/TrackerActivityLifeCyle.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/TrackerKeys.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/TrackerQueue.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/Tracker/src/main/res/layout/debugger_bubble_layout.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/Tracker/src/main/res/values/values.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/Tracker/src/test/java/com/atinternet/tracker/HitTest.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/Tracker/src/test/java/com/atinternet/tracker/ParamOptionTest.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/Tracker/src/test/java/com/atinternet/tracker/ParamTest.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/defaultConfiguration.json" afterPath="" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/TestApp/src/main/res/drawable/atinternet_logo.png" afterPath="$PROJECT_DIR$/TestApp/src/main/res/drawable/atinternet_logo.png" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/TestApp/src/main/res/mipmap-hdpi/ic_launcher.png" afterPath="$PROJECT_DIR$/TestApp/src/main/res/mipmap-hdpi/ic_launcher.png" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/TestApp/src/main/res/mipmap-mdpi/ic_launcher.png" afterPath="$PROJECT_DIR$/TestApp/src/main/res/mipmap-mdpi/ic_launcher.png" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/TestApp/src/main/res/mipmap-xhdpi/ic_launcher.png" afterPath="$PROJECT_DIR$/TestApp/src/main/res/mipmap-xhdpi/ic_launcher.png" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/TestApp/src/main/res/mipmap-xxhdpi/ic_launcher.png" afterPath="$PROJECT_DIR$/TestApp/src/main/res/mipmap-xxhdpi/ic_launcher.png" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/TestApp/src/main/res/mipmap-xxxhdpi/ic_launcher.png" afterPath="$PROJECT_DIR$/TestApp/src/main/res/mipmap-xxxhdpi/ic_launcher.png" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/TestApp/TestApp.iml" afterPath="$PROJECT_DIR$/TestApp/TestApp.iml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/TestApp/src/main/java/com/atinternet/FirstScreenActivity.java" afterPath="$PROJECT_DIR$/TestApp/src/main/java/com/atinternet/FirstScreenActivity.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/AbstractTestClass.java" afterPath="$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/AbstractTestClass.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/BuilderTest.java" afterPath="$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/BuilderTest.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/ConfigurationTest.java" afterPath="$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/ConfigurationTest.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/IdentifiedVisitorTest.java" afterPath="$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/IdentifiedVisitorTest.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/NuggAdTest.java" afterPath="$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/NuggAdTest.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/PluginParamTest.java" afterPath="$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/PluginParamTest.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/StorageTest.java" afterPath="$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/StorageTest.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/TVTrackingTest.java" afterPath="$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/TVTrackingTest.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/TechnicalContextTest.java" afterPath="$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/TechnicalContextTest.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/ToolTest.java" afterPath="$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/ToolTest.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/TrackerTest.java" afterPath="$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/TrackerTest.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/Configuration.java" afterPath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/Configuration.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/Dispatcher.java" afterPath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/Dispatcher.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/IdentifiedVisitor.java" afterPath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/IdentifiedVisitor.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/Sender.java" afterPath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/Sender.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/Storage.java" afterPath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/Storage.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/TVTracking.java" afterPath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/TVTracking.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/Tool.java" afterPath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/Tool.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/Tracker.java" afterPath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/Tracker.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/TrackerKeys.java" afterPath="$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/TrackerKeys.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" afterPath="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/TestApp/build.gradle" afterPath="$PROJECT_DIR$/TestApp/build.gradle" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/TestApp/proguard-rules.pro" afterPath="$PROJECT_DIR$/TestApp/proguard-rules.pro" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/TestApp/src/main/AndroidManifest.xml" afterPath="$PROJECT_DIR$/TestApp/src/main/AndroidManifest.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/TestApp/src/main/java/com/atinternet/Integration.java" afterPath="$PROJECT_DIR$/TestApp/src/main/java/com/atinternet/Integration.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/TestApp/src/main/java/com/atinternet/MainActivity.java" afterPath="$PROJECT_DIR$/TestApp/src/main/java/com/atinternet/MainActivity.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/TestApp/src/main/java/com/atinternet/Operation.java" afterPath="$PROJECT_DIR$/TestApp/src/main/java/com/atinternet/Operation.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/TestApp/src/main/res/layout/activity_main.xml" afterPath="$PROJECT_DIR$/TestApp/src/main/res/layout/activity_main.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/TestApp/src/main/res/values-w820dp/dimens.xml" afterPath="$PROJECT_DIR$/TestApp/src/main/res/values-w820dp/dimens.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/TestApp/src/main/res/values/colors.xml" afterPath="$PROJECT_DIR$/TestApp/src/main/res/values/colors.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/TestApp/src/main/res/values/dimens.xml" afterPath="$PROJECT_DIR$/TestApp/src/main/res/values/dimens.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/TestApp/src/main/res/values/strings.xml" afterPath="$PROJECT_DIR$/TestApp/src/main/res/values/strings.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/TestApp/src/main/res/values/styles.xml" afterPath="$PROJECT_DIR$/TestApp/src/main/res/values/styles.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Tracker/Tracker.iml" afterPath="$PROJECT_DIR$/Tracker/Tracker.iml" />
     </list>
     <ignored path="ATMobileAnalytics.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -91,11 +173,15 @@
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
   <component name="CreatePatchCommitExecutor">
     <option name="PATCH_PATH" value="" />
   </component>
   <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
+  <component name="ExternalProjectsData">
+    <projectState path="$PROJECT_DIR$">
+      <ProjectState />
+    </projectState>
+  </component>
   <component name="ExternalProjectsManager">
     <system id="GRADLE">
       <state>
@@ -181,47 +267,47 @@
       <file leaf-file-name="Tracker.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/Tracker.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="1.0205883">
-              <caret line="709" column="55" selection-start-line="709" selection-start-column="55" selection-end-line="709" selection-end-column="55" />
-              <folding>
-                <element signature="e#20115#20680#0" expanded="true" />
-                <element signature="e#20679#20680#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="SetConfigCallbackTest.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/SetConfigCallbackTest.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="38" column="61" selection-start-line="38" selection-start-column="61" selection-end-line="38" selection-end-column="61" />
-              <folding>
-                <element signature="e#1836#1837#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="TrackerQueue.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/TrackerQueue.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="96" column="0" selection-start-line="96" selection-start-column="0" selection-end-line="96" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="FirstScreenActivity.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/TestApp/src/main/java/com/atinternet/FirstScreenActivity.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="55" column="13" selection-start-line="55" selection-start-column="13" selection-end-line="55" selection-end-column="13" />
+            <state relative-caret-position="120">
+              <caret line="692" column="51" selection-start-line="692" selection-start-column="51" selection-end-line="692" selection-end-column="51" />
               <folding>
-                <element signature="e#795#995#0" expanded="true" />
-                <element signature="e#994#995#0" expanded="true" />
-                <element signature="e#1632#1831#0" expanded="true" />
+                <element signature="e#3863#3864#0" expanded="true" />
+                <element signature="e#3892#3893#0" expanded="true" />
+                <element signature="e#3927#3928#0" expanded="true" />
+                <element signature="e#3957#3958#0" expanded="true" />
+                <element signature="e#4023#4024#0" expanded="true" />
+                <element signature="e#4061#4062#0" expanded="true" />
+                <element signature="e#4095#4096#0" expanded="true" />
+                <element signature="e#4128#4129#0" expanded="true" />
+                <element signature="e#4182#4183#0" expanded="true" />
+                <element signature="e#4221#4222#0" expanded="true" />
+                <element signature="e#4440#4441#0" expanded="true" />
+                <element signature="e#4477#4478#0" expanded="true" />
+                <element signature="e#4530#4531#0" expanded="true" />
+                <element signature="e#4582#4583#0" expanded="true" />
+                <element signature="e#8482#8483#0" expanded="true" />
+                <element signature="e#8532#8533#0" expanded="true" />
+                <element signature="e#10918#10919#0" expanded="true" />
+                <element signature="e#10954#10955#0" expanded="true" />
+                <element signature="e#11105#11106#0" expanded="true" />
+                <element signature="e#11136#11137#0" expanded="true" />
+                <element signature="e#12786#12787#0" expanded="true" />
+                <element signature="e#12866#12867#0" expanded="true" />
+                <element signature="e#13160#13161#0" expanded="true" />
+                <element signature="e#13232#13233#0" expanded="true" />
+                <element signature="e#13347#13348#0" expanded="true" />
+                <element signature="e#13427#13428#0" expanded="true" />
+                <element signature="e#13542#13543#0" expanded="true" />
+                <element signature="e#13622#13623#0" expanded="true" />
+                <element signature="e#13954#13955#0" expanded="true" />
+                <element signature="e#14034#14035#0" expanded="true" />
+                <element signature="e#15579#15580#0" expanded="true" />
+                <element signature="e#15647#15648#0" expanded="true" />
+                <element signature="e#16742#16743#0" expanded="true" />
+                <element signature="e#16818#16819#0" expanded="true" />
+                <element signature="e#17950#17951#0" expanded="true" />
+                <element signature="e#18026#18027#0" expanded="true" />
+                <element signature="e#39383#39384#0" expanded="true" />
+                <element signature="e#39469#39470#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -230,9 +316,11 @@
       <file leaf-file-name="SetConfigCallback.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/SetConfigCallback.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="28" column="22" selection-start-line="28" selection-start-column="22" selection-end-line="28" selection-end-column="22" />
-              <folding />
+            <state relative-caret-position="105">
+              <caret line="31" column="22" selection-start-line="31" selection-start-column="22" selection-end-line="31" selection-end-column="22" />
+              <folding>
+                <element signature="e#0#1468#0" expanded="false" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -243,6 +331,16 @@
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
   </component>
   <component name="GradleLocalSettings">
+    <option name="myGradleHomes">
+      <map>
+        <entry key="$PROJECT_DIR$" value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3" />
+      </map>
+    </option>
+    <option name="myGradleVersions">
+      <map>
+        <entry key="$PROJECT_DIR$" value="3.3" />
+      </map>
+    </option>
     <option name="availableProjects">
       <map>
         <entry>
@@ -254,6 +352,10 @@
           </key>
           <value>
             <list>
+              <ExternalProjectPojo>
+                <option name="name" value="ATMobileAnalytics" />
+                <option name="path" value="$PROJECT_DIR$" />
+              </ExternalProjectPojo>
               <ExternalProjectPojo>
                 <option name="name" value=":TestApp" />
                 <option name="path" value="$PROJECT_DIR$/TestApp" />
@@ -262,10 +364,6 @@
                 <option name="name" value=":Tracker" />
                 <option name="path" value="$PROJECT_DIR$/Tracker" />
               </ExternalProjectPojo>
-              <ExternalProjectPojo>
-                <option name="name" value="ATMobileAnalytics" />
-                <option name="path" value="$PROJECT_DIR$" />
-              </ExternalProjectPojo>
             </list>
           </value>
         </entry>
@@ -277,655 +375,1209 @@
           <value>
             <list>
               <ExternalTaskPojo>
-                <option name="description" value="Displays the Android dependencies of the project" />
+                <option name="description" value="Displays the sub-projects of root project 'ATMobileAnalytics'." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="androidDependencies" />
+                <option name="name" value="projects" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Assembles all variants of all applications and secondary packages." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="assemble" />
+                <option name="name" value="packageReleaseResources" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Assembles all Debug builds" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="assembleDebug" />
+                <option name="name" value="validateSigningDebugAndroidTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Assembles the Test build for the Debug build" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="assembleDebugTest" />
+                <option name="name" value="prepareDebugDependencies" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Assembles all Release builds" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="assembleRelease" />
+                <option name="name" value="copyDebugLint" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Assembles and tests this project." />
+                <option name="description" value="Prepare com.android.support:support-media-compat:25.0.0" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="build" />
+                <option name="name" value="prepareComAndroidSupportSupportMediaCompat2500Library" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Assembles and tests this project and all projects that depend on it." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="buildDependents" />
+                <option name="name" value="assembleDebugUnitTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Assembles and tests this project and all projects it depends on." />
+                <option name="description" value="Creates a version of android.jar that's suitable for unit tests." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="buildNeeded" />
+                <option name="name" value="mockableAndroidJar" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Runs all checks." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="check" />
+                <option name="name" value="compileDebugSources" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Prepare com.google.android.gms:play-services-gass:10.2.1" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="checkDebugManifest" />
+                <option name="name" value="prepareComGoogleAndroidGmsPlayServicesGass1021Library" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="checkReleaseManifest" />
+                <option name="name" value="javadocJar" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Deletes the build directory." />
+                <option name="description" value="Runs all device checks using Device Providers and Test Servers." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="clean" />
+                <option name="name" value="deviceCheck" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="compileDebugAidl" />
+                <option name="name" value="processDebugResources" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Runs lint on all variants." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="compileDebugJava" />
+                <option name="name" value="lint" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="compileDebugNdk" />
+                <option name="name" value="compileReleaseNdk" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="compileDebugRenderscript" />
+                <option name="name" value="compileDebugJavaWithJavac" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="compileDebugSources" />
+                <option name="name" value="generateDebugAndroidTestBuildConfig" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Deletes the build cache directory." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="compileDebugTestAidl" />
+                <option name="name" value="cleanBuildCache" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="compileDebugTestJava" />
+                <option name="name" value="assembleDefault" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="compileDebugTestNdk" />
+                <option name="name" value="compileDebugAndroidTestShaders" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="compileDebugTestRenderscript" />
+                <option name="name" value="compileDebugAndroidTestJavaWithJavac" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Displays the components produced by root project 'ATMobileAnalytics'. [incubating]" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="compileDebugTestSources" />
+                <option name="name" value="components" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="compileLint" />
+                <option name="name" value="processDebugAndroidTestManifest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="compileReleaseAidl" />
+                <option name="name" value="compileDebugUnitTestJavaWithJavac" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="compileReleaseJava" />
+                <option name="name" value="createProdDelivery" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="compileReleaseNdk" />
+                <option name="name" value="transformResourcesWithMergeJavaResForReleaseUnitTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="compileReleaseRenderscript" />
+                <option name="name" value="transformClassesWithDexForDebug" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="compileReleaseSources" />
+                <option name="name" value="preDebugAndroidTestBuild" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Installs and runs the tests for Build 'debug' on connected devices." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="connectedAndroidTest" />
+                <option name="name" value="processDebugAndroidTestJavaRes" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Runs all device checks on currently connected devices." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="connectedCheck" />
+                <option name="name" value="processReleaseUnitTestJavaRes" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Runs all device checks using Device Providers and Test Servers." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="deviceCheck" />
+                <option name="name" value="javadoc" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Uninstalls the Release build." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="dexDebug" />
+                <option name="name" value="uninstallRelease" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="dexDebugTest" />
+                <option name="name" value="transformClassesAndResourcesWithSyncLibJarsForRelease" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="dexRelease" />
+                <option name="name" value="compileReleaseShaders" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="generateDebugAssets" />
+                <option name="name" value="mergeReleaseResources" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="generateDebugBuildConfig" />
+                <option name="name" value="prepareDebugAndroidTestDependencies" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="generateDebugResValues" />
+                <option name="name" value="transformClassesAndResourcesWithSyncLibJarsForDebug" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="generateDebugResources" />
+                <option name="name" value="checkReleaseManifest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="generateDebugSources" />
+                <option name="name" value="javaPreCompileDebugUnitTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="generateDebugTestAssets" />
+                <option name="name" value="packageDebugResources" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="generateDebugTestBuildConfig" />
+                <option name="name" value="transformNativeLibsWithSyncJniLibsForDebug" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="generateDebugTestResValues" />
+                <option name="name" value="mergeReleaseJniLibFolders" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="generateDebugTestResources" />
+                <option name="name" value="processReleaseResources" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Installs and runs instrumentation tests using all Device Providers." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="generateDebugTestSources" />
+                <option name="name" value="deviceAndroidTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="generateReleaseAssets" />
+                <option name="name" value="mergeDebugAndroidTestAssets" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="generateReleaseBuildConfig" />
+                <option name="name" value="processReleaseManifest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Uninstalls the android (on device) tests for the Debug build." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="generateReleaseResValues" />
+                <option name="name" value="uninstallDebugAndroidTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="generateReleaseResources" />
+                <option name="name" value="incrementalReleaseUnitTestJavaCompilationSafeguard" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Assembles all variants of all applications and secondary packages." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="generateReleaseSources" />
+                <option name="name" value="assemble" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Installs the Debug build" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="installDebug" />
+                <option name="name" value="compileReleaseUnitTestSources" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Installs the Test build for the Debug build" />
+                <option name="description" value="Installs the android (on device) tests for the Debug build." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="installDebugTest" />
+                <option name="name" value="installDebugAndroidTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Runs lint on all variants." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="lint" />
+                <option name="name" value="clearDelivery" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Runs lint on the Debug build" />
+                <option name="description" value="Runs all device checks on currently connected devices." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="lintDebug" />
+                <option name="name" value="connectedCheck" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Runs lint on the Release build" />
+                <option name="description" value="Installs and runs the tests for debug on connected devices." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="lintRelease" />
+                <option name="name" value="connectedDebugAndroidTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Runs lint on just the fatal issues in the Release build" />
+                <option name="description" value="Assembles all the Test applications." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="lintVitalRelease" />
+                <option name="name" value="assembleAndroidTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="mergeDebugAssets" />
+                <option name="name" value="processDebugAndroidTestResources" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="mergeDebugResources" />
+                <option name="name" value="validateSigningDebug" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Extracts Android annotations for the release variant into the archive file" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="mergeDebugTestAssets" />
+                <option name="name" value="extractReleaseAnnotations" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="mergeDebugTestResources" />
+                <option name="name" value="mergeDebugResources" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="mergeReleaseAssets" />
+                <option name="name" value="preDebugUnitTestBuild" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="mergeReleaseResources" />
+                <option name="name" value="compileLint" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="packageDebug" />
+                <option name="name" value="transformNativeLibsWithMergeJniLibsForDebugAndroidTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="packageDebugTest" />
+                <option name="name" value="mergeReleaseShaders" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="packageRelease" />
+                <option name="name" value="sourcesJar" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="preBuild" />
+                <option name="name" value="compileDebugAndroidTestNdk" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="preDebugBuild" />
+                <option name="name" value="transformNativeLibsWithMergeJniLibsForRelease" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Prepare com.android.support:support-core-utils:25.0.0" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="preDebugTestBuild" />
+                <option name="name" value="prepareComAndroidSupportSupportCoreUtils2500Library" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="preDexDebug" />
+                <option name="name" value="mergeDebugAndroidTestJniLibFolders" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="preDexDebugTest" />
+                <option name="name" value="extractProguardFiles" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="preDexRelease" />
+                <option name="name" value="transformClassesWithDexForDebugAndroidTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="preReleaseBuild" />
+                <option name="name" value="assembleDebugAndroidTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Prepare com.android.support:appcompat-v7:22.2.1" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="prepareComAndroidSupportAppcompatV72221Library" />
+                <option name="name" value="copyReleaseLint" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Prepare com.android.support:support-v4:22.2.1" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="prepareComAndroidSupportSupportV42221Library" />
+                <option name="name" value="generateDebugAndroidTestAssets" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Prepare com.atinternet:Tracker:2.2.0" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="prepareComAtinternetTracker220Library" />
+                <option name="name" value="transformResourcesWithMergeJavaResForDebugAndroidTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="prepareDebugDependencies" />
+                <option name="name" value="prepareReleaseUnitTestDependencies" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Run unit tests for all variants." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="prepareDebugTestDependencies" />
+                <option name="name" value="test" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="prepareReleaseDependencies" />
+                <option name="name" value="mergeDebugAndroidTestResources" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="processDebugJavaRes" />
+                <option name="name" value="preReleaseUnitTestBuild" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="processDebugManifest" />
+                <option name="name" value="generateDebugResValues" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Runs all checks." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="processDebugResources" />
+                <option name="name" value="check" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Run unit tests for the debug build." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="processDebugTestJavaRes" />
+                <option name="name" value="testDebugUnitTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="processDebugTestManifest" />
+                <option name="name" value="jarDebugClasses" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Installs the Debug build." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="processDebugTestResources" />
+                <option name="name" value="installDebug" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="processReleaseJavaRes" />
+                <option name="name" value="preBuild" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="processReleaseManifest" />
+                <option name="name" value="compileReleaseAidl" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Runs lint on the Release build." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="processReleaseResources" />
+                <option name="name" value="lintRelease" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Displays the signing info for each variant" />
+                <option name="description" value="Prepare com.google.android.gms:play-services-tasks:10.2.1" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="signingReport" />
+                <option name="name" value="prepareComGoogleAndroidGmsPlayServicesTasks1021Library" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Uninstall all applications." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="uninstallAll" />
+                <option name="name" value="generateDebugAssets" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Uninstalls the Debug build" />
+                <option name="description" value="Displays the dependent components of components in root project 'ATMobileAnalytics'. [incubating]" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="uninstallDebug" />
+                <option name="name" value="dependentComponents" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Uninstalls the Test build for the Debug build" />
+                <option name="description" value="Displays all buildscript dependencies declared in root project 'ATMobileAnalytics'." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="uninstallDebugTest" />
+                <option name="name" value="buildEnvironment" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Uninstalls the Release build" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="uninstallRelease" />
+                <option name="name" value="checkDebugManifest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Prints out all the source sets defined in this project." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="validateDebugSigning" />
+                <option name="name" value="sourceSets" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="zipalignDebug" />
+                <option name="name" value="transformResourcesWithMergeJavaResForDebugUnitTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="assembleDefault" />
+                <option name="name" value="compileDebugRenderscript" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Publishes artifacts to bintray.com." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="bintrayUpload" />
+                <option name="name" value="packageDebugRenderscript" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Assembles a bundle containing the library in Debug." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="bundleDebug" />
+                <option name="name" value="prepareDebugUnitTestDependencies" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Assembles a bundle containing the library in Release." />
+                <option name="description" value="Prepare com.google.android.gms:play-services-basement:10.2.1" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="bundleRelease" />
+                <option name="name" value="prepareComGoogleAndroidGmsPlayServicesBasement1021Library" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="clearJar" />
+                <option name="name" value="generateReleaseResources" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Uninstalls the Debug build." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="compileTestDebugJava" />
+                <option name="name" value="uninstallDebug" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="copyDebugLint" />
+                <option name="name" value="preDebugBuild" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="copyReleaseLint" />
+                <option name="name" value="generateDebugBuildConfig" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Extracts Android annotations for the debug variant into the archive file" />
+                <option name="description" value="Assembles all Release builds." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="extractDebugAnnotations" />
+                <option name="name" value="assembleRelease" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Extracts Android annotations for the release variant into the archive file" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="extractReleaseAnnotations" />
+                <option name="name" value="generateReleaseResValues" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Installs the 'archives' artifacts into the local Maven repository." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="install" />
+                <option name="name" value="mergeDebugProguardFiles" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Prepare com.google.android.gms:play-services-ads:10.2.1" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="javadoc" />
+                <option name="name" value="prepareComGoogleAndroidGmsPlayServicesAds1021Library" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="javadocJar" />
+                <option name="name" value="transformNativeLibsWithSyncJniLibsForRelease" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="makeJar" />
+                <option name="name" value="assembleReleaseUnitTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Assembles a bundle containing the library in debug." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="mergeDebugProguardFiles" />
+                <option name="name" value="bundleDebug" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="mergeReleaseProguardFiles" />
+                <option name="name" value="processReleaseJavaRes" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="packageDebugJar" />
+                <option name="name" value="generateReleaseAssets" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Runs lint on the Debug build." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="packageDebugJniLibs" />
+                <option name="name" value="lintDebug" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Assembles a bundle containing the library in release." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="packageDebugLocalJar" />
+                <option name="name" value="bundleRelease" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Displays the configuration model of root project 'ATMobileAnalytics'. [incubating]" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="packageDebugRenderscript" />
+                <option name="name" value="model" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Displays the tasks runnable from root project 'ATMobileAnalytics' (some of the displayed tasks may belong to subprojects)." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="packageDebugResources" />
+                <option name="name" value="tasks" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Initializes a new Gradle build. [incubating]" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="packageReleaseJar" />
+                <option name="name" value="init" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="packageReleaseJniLibs" />
+                <option name="name" value="packageReleaseRenderscript" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="packageReleaseLocalJar" />
+                <option name="name" value="mergeReleaseProguardFiles" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="packageReleaseRenderscript" />
+                <option name="name" value="incrementalDebugJavaCompilationSafeguard" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Displays all dependencies declared in root project 'ATMobileAnalytics'." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="packageReleaseResources" />
+                <option name="name" value="dependencies" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Prepare com.android.support:support-v4:23.0.0" />
+                <option name="description" value="Prepare com.android.support:appcompat-v7:25.0.0" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="prepareComAndroidSupportSupportV42300Library" />
+                <option name="name" value="prepareComAndroidSupportAppcompatV72500Library" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Prepare com.google.android.gms:play-services-ads:8.4.0" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="prepareComGoogleAndroidGmsPlayServicesAds840Library" />
+                <option name="name" value="packageDebug" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Prepare com.google.android.gms:play-services-basement:8.4.0" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="prepareComGoogleAndroidGmsPlayServicesBasement840Library" />
+                <option name="name" value="generateDebugResources" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Processes JVM resources 'testDebug:resources'." />
+                <option name="description" value="Installs the 'archives' artifacts into the local Maven repository." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="processTestDebugResources" />
+                <option name="name" value="install" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Assembles and tests this project and all projects it depends on." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="sourcesJar" />
+                <option name="name" value="buildNeeded" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Runs all unit tests." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="test" />
+                <option name="name" value="processDebugUnitTestJavaRes" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Run unit tests for Build 'Debug'." />
+                <option name="description" value="Run unit tests for the release build." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="testDebug" />
+                <option name="name" value="testReleaseUnitTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
-                <option name="name" value="testDebugClasses" />
+                <option name="name" value="mergeDebugShaders" />
               </ExternalTaskPojo>
-            </list>
-          </value>
-        </entry>
-        <entry key="$PROJECT_DIR$/TestApp">
-          <value>
-            <list>
               <ExternalTaskPojo>
-                <option name="description" value="Displays the Android dependencies of the project" />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="androidDependencies" />
+                <option name="description" value="Prepare com.android.support:support-fragment:25.0.0" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="prepareComAndroidSupportSupportFragment2500Library" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Assembles all variants of all applications and secondary packages." />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="assemble" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="compileReleaseRenderscript" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Assembles all Debug builds" />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="description" value="Assembles all Debug builds." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
                 <option name="name" value="assembleDebug" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Assembles the Test build for the Debug build" />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="assembleDebugTest" />
+                <option name="description" value="Extracts Android annotations for the debug variant into the archive file" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="extractDebugAnnotations" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Assembles all Release builds" />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="assembleRelease" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="javaPreCompileDebugAndroidTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Assembles and tests this project." />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="build" />
+                <option name="description" value="Prepare com.android.support:support-v4:24.0.0" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="prepareComAndroidSupportSupportV42400Library" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Assembles and tests this project and all projects that depend on it." />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="buildDependents" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="generateDebugAndroidTestSources" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Assembles and tests this project and all projects it depends on." />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="buildNeeded" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="incrementalDebugAndroidTestJavaCompilationSafeguard" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Runs all checks." />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="check" />
+                <option name="description" value="Prepare com.android.support:support-vector-drawable:25.0.0" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="prepareComAndroidSupportSupportVectorDrawable2500Library" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="checkDebugManifest" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="compileDebugAndroidTestSources" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="checkReleaseManifest" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="prepareReleaseDependencies" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Deletes the build directory." />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="clean" />
+                <option name="description" value="Displays the insight into a specific dependency in root project 'ATMobileAnalytics'." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="dependencyInsight" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="compileDebugAidl" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="generateReleaseSources" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="compileDebugJava" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="preReleaseBuild" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="compileDebugNdk" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="incrementalDebugUnitTestJavaCompilationSafeguard" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="compileDebugRenderscript" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="incrementalReleaseJavaCompilationSafeguard" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="compileDebugSources" />
+                <option name="description" value="Displays a help message." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="help" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="compileDebugTestAidl" />
+                <option name="description" value="Prepare com.google.android.gms:play-services-clearcut:10.2.1" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="prepareComGoogleAndroidGmsPlayServicesClearcut1021Library" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="mergeDebugAssets" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="javaPreCompileReleaseUnitTest" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="javaPreCompileRelease" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Prepare com.google.android.gms:play-services-ads-lite:10.2.1" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="prepareComGoogleAndroidGmsPlayServicesAdsLite1021Library" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Uninstall all applications." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="uninstallAll" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="transformNativeLibsWithMergeJniLibsForDebug" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Prepare com.android.support:animated-vector-drawable:25.0.0" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="prepareComAndroidSupportAnimatedVectorDrawable2500Library" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="packageRelease" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="compileDebugAidl" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Publishes artifacts to bintray.com." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="bintrayUpload" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Generates Gradle wrapper files. [incubating]" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="wrapper" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="generateDebugAndroidTestResValues" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Displays the Android dependencies of the project." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="androidDependencies" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="compileDebugUnitTestSources" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="generateDebugSources" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="processDebugJavaRes" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="compileReleaseJavaWithJavac" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Prepare com.android.support:support-compat:25.0.0" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="prepareComAndroidSupportSupportCompat2500Library" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="jarReleaseClasses" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="compileDebugNdk" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="javaPreCompileDebug" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Prepare com.google.android.gms:play-services-base:10.2.1" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="prepareComGoogleAndroidGmsPlayServicesBase1021Library" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Installs and runs instrumentation tests for all flavors on connected devices." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="connectedAndroidTest" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="transformClassesWithDexForRelease" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="transformResourcesWithMergeJavaResForRelease" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="compileReleaseSources" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="compileReleaseUnitTestJavaWithJavac" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="compileDebugShaders" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="transformResourcesWithMergeJavaResForDebug" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Assembles and tests this project and all projects that depend on it." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="buildDependents" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Prepare com.android.support:support-core-ui:25.0.0" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="prepareComAndroidSupportSupportCoreUi2500Library" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="mergeDebugJniLibFolders" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="mergeReleaseAssets" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="generateReleaseBuildConfig" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="createAlphaDelivery" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Displays the signing info for each variant." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="signingReport" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="compileDebugAndroidTestAidl" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="mergeDebugAndroidTestShaders" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Deletes the build directory." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="clean" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Assembles and tests this project." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="build" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="compileDebugAndroidTestRenderscript" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="generateDebugAndroidTestResources" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="processDebugManifest" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="packageDebugAndroidTest" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Prepare com.android.support:support-v4:25.0.0" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="prepareComAndroidSupportSupportV42500Library" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Displays the properties of root project 'ATMobileAnalytics'." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="properties" />
+              </ExternalTaskPojo>
+            </list>
+          </value>
+        </entry>
+        <entry key="$PROJECT_DIR$/TestApp">
+          <value>
+            <list>
+              <ExternalTaskPojo>
+                <option name="description" value="Displays the sub-projects of project ':TestApp'." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="projects" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="validateSigningDebugAndroidTest" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="assembleReleaseUnitTest" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="prepareDebugDependencies" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="processReleaseJavaRes" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="generateReleaseAssets" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Runs lint on the Debug build." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="lintDebug" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Prepare com.android.support:support-media-compat:25.0.0" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="prepareComAndroidSupportSupportMediaCompat2500Library" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="assembleDebugUnitTest" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Creates a version of android.jar that's suitable for unit tests." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="mockableAndroidJar" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Displays the configuration model of project ':TestApp'. [incubating]" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="model" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Displays the tasks runnable from project ':TestApp'." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="tasks" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="compileDebugSources" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="incrementalDebugJavaCompilationSafeguard" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Runs all device checks using Device Providers and Test Servers." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="deviceCheck" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Displays all dependencies declared in project ':TestApp'." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="dependencies" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Prepare com.android.support:appcompat-v7:25.0.0" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="prepareComAndroidSupportAppcompatV72500Library" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="processDebugResources" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Runs lint on all variants." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="lint" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="packageDebug" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="compileReleaseNdk" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="generateDebugResources" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="compileDebugJavaWithJavac" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Assembles and tests this project and all projects it depends on." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="buildNeeded" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="generateDebugAndroidTestBuildConfig" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="processDebugUnitTestJavaRes" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Run unit tests for the release build." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="testReleaseUnitTest" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Deletes the build cache directory." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="cleanBuildCache" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="compileDebugAndroidTestShaders" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="mergeDebugShaders" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Prepare com.android.support:support-fragment:25.0.0" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="prepareComAndroidSupportSupportFragment2500Library" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="compileDebugAndroidTestJavaWithJavac" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Displays the components produced by project ':TestApp'. [incubating]" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="components" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="compileReleaseRenderscript" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Assembles all Debug builds." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="assembleDebug" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="processDebugAndroidTestManifest" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="compileDebugUnitTestJavaWithJavac" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="transformResourcesWithMergeJavaResForReleaseUnitTest" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="transformClassesWithDexForDebug" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="preDebugAndroidTestBuild" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="processDebugAndroidTestJavaRes" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="processReleaseUnitTestJavaRes" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="javaPreCompileDebugAndroidTest" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Uninstalls the Release build." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="uninstallRelease" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="compileReleaseShaders" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="mergeReleaseResources" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="generateDebugAndroidTestSources" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="prepareDebugAndroidTestDependencies" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="incrementalDebugAndroidTestJavaCompilationSafeguard" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="checkReleaseManifest" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="javaPreCompileDebugUnitTest" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Prepare com.android.support:support-vector-drawable:25.0.0" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="prepareComAndroidSupportSupportVectorDrawable2500Library" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="compileDebugAndroidTestSources" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="mergeReleaseJniLibFolders" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="prepareReleaseDependencies" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="processReleaseResources" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Installs and runs instrumentation tests using all Device Providers." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="deviceAndroidTest" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="mergeDebugAndroidTestAssets" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="processReleaseManifest" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Uninstalls the android (on device) tests for the Debug build." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="uninstallDebugAndroidTest" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Displays the insight into a specific dependency in project ':TestApp'." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="dependencyInsight" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="generateReleaseSources" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="incrementalReleaseUnitTestJavaCompilationSafeguard" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="preReleaseBuild" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Assembles all variants of all applications and secondary packages." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="assemble" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="incrementalDebugUnitTestJavaCompilationSafeguard" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="incrementalReleaseJavaCompilationSafeguard" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Displays a help message." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="help" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="compileReleaseUnitTestSources" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Installs the android (on device) tests for the Debug build." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="installDebugAndroidTest" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="mergeDebugAssets" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="javaPreCompileReleaseUnitTest" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="javaPreCompileRelease" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Runs all device checks on currently connected devices." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="connectedCheck" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Installs and runs the tests for debug on connected devices." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="connectedDebugAndroidTest" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Uninstall all applications." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="uninstallAll" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="transformNativeLibsWithMergeJniLibsForDebug" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Assembles all the Test applications." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="assembleAndroidTest" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="processDebugAndroidTestResources" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Prepare com.android.support:animated-vector-drawable:25.0.0" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="prepareComAndroidSupportAnimatedVectorDrawable2500Library" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="packageRelease" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="compileDebugTestJava" />
+                <option name="name" value="validateSigningDebug" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="compileDebugTestNdk" />
+                <option name="name" value="compileDebugAidl" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="compileDebugTestRenderscript" />
+                <option name="name" value="mergeDebugResources" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="compileDebugTestSources" />
+                <option name="name" value="preDebugUnitTestBuild" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
@@ -933,156 +1585,213 @@
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="compileReleaseAidl" />
+                <option name="name" value="generateDebugAndroidTestResValues" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="compileReleaseJava" />
+                <option name="name" value="transformNativeLibsWithMergeJniLibsForDebugAndroidTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="compileReleaseNdk" />
+                <option name="name" value="mergeReleaseShaders" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Displays the Android dependencies of the project." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="compileReleaseRenderscript" />
+                <option name="name" value="androidDependencies" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="compileReleaseSources" />
+                <option name="name" value="compileDebugAndroidTestNdk" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Installs and runs the tests for Build 'debug' on connected devices." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="connectedAndroidTest" />
+                <option name="name" value="compileDebugUnitTestSources" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Runs all device checks on currently connected devices." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="connectedCheck" />
+                <option name="name" value="transformNativeLibsWithMergeJniLibsForRelease" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Runs all device checks using Device Providers and Test Servers." />
+                <option name="description" value="Prepare com.android.support:support-core-utils:25.0.0" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="deviceCheck" />
+                <option name="name" value="prepareComAndroidSupportSupportCoreUtils2500Library" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="dexDebug" />
+                <option name="name" value="generateDebugSources" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="dexDebugTest" />
+                <option name="name" value="mergeDebugAndroidTestJniLibFolders" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="dexRelease" />
+                <option name="name" value="extractProguardFiles" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="generateDebugAssets" />
+                <option name="name" value="transformClassesWithDexForDebugAndroidTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="generateDebugBuildConfig" />
+                <option name="name" value="assembleDebugAndroidTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="generateDebugResValues" />
+                <option name="name" value="processDebugJavaRes" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="generateDebugResources" />
+                <option name="name" value="generateDebugAndroidTestAssets" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="generateDebugSources" />
+                <option name="name" value="compileReleaseJavaWithJavac" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Prepare com.android.support:support-compat:25.0.0" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="generateDebugTestAssets" />
+                <option name="name" value="prepareComAndroidSupportSupportCompat2500Library" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="generateDebugTestBuildConfig" />
+                <option name="name" value="jarReleaseClasses" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="generateDebugTestResValues" />
+                <option name="name" value="transformResourcesWithMergeJavaResForDebugAndroidTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="generateDebugTestResources" />
+                <option name="name" value="prepareReleaseUnitTestDependencies" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Run unit tests for all variants." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="generateDebugTestSources" />
+                <option name="name" value="test" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="generateReleaseAssets" />
+                <option name="name" value="compileDebugNdk" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="generateReleaseBuildConfig" />
+                <option name="name" value="mergeDebugAndroidTestResources" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="generateReleaseResValues" />
+                <option name="name" value="preReleaseUnitTestBuild" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="generateReleaseResources" />
+                <option name="name" value="generateDebugResValues" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Runs all checks." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="generateReleaseSources" />
+                <option name="name" value="check" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="javaPreCompileDebug" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Run unit tests for the debug build." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="testDebugUnitTest" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Installs and runs instrumentation tests for all flavors on connected devices." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="connectedAndroidTest" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="jarDebugClasses" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Installs the Debug build" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="transformClassesWithDexForRelease" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Installs the Debug build." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
                 <option name="name" value="installDebug" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Installs the Test build for the Debug build" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="installDebugTest" />
+                <option name="name" value="preBuild" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Runs lint on all variants." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="lint" />
+                <option name="name" value="transformResourcesWithMergeJavaResForRelease" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Runs lint on the Debug build" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="lintDebug" />
+                <option name="name" value="compileReleaseSources" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="compileReleaseUnitTestJavaWithJavac" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="compileDebugShaders" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="transformResourcesWithMergeJavaResForDebug" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="compileReleaseAidl" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Runs lint on the Release build" />
+                <option name="description" value="Runs lint on the Release build." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
                 <option name="name" value="lintRelease" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Runs lint on just the fatal issues in the Release build" />
+                <option name="description" value="Assembles and tests this project and all projects that depend on it." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="lintVitalRelease" />
+                <option name="name" value="buildDependents" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="mergeDebugAssets" />
+                <option name="name" value="generateDebugAssets" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Displays the dependent components of components in project ':TestApp'. [incubating]" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="mergeDebugResources" />
+                <option name="name" value="dependentComponents" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Displays all buildscript dependencies declared in project ':TestApp'." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="buildEnvironment" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="checkDebugManifest" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Prepare com.android.support:support-core-ui:25.0.0" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="prepareComAndroidSupportSupportCoreUi2500Library" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="mergeDebugTestAssets" />
+                <option name="name" value="mergeDebugJniLibFolders" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Prints out all the source sets defined in this project." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="mergeDebugTestResources" />
+                <option name="name" value="sourceSets" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="transformResourcesWithMergeJavaResForDebugUnitTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
@@ -1090,23 +1799,42 @@
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="mergeReleaseResources" />
+                <option name="name" value="compileDebugRenderscript" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="packageDebug" />
+                <option name="name" value="generateReleaseBuildConfig" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="packageDebugTest" />
+                <option name="name" value="prepareDebugUnitTestDependencies" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="packageRelease" />
+                <option name="name" value="generateReleaseResources" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Uninstalls the Debug build." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="preBuild" />
+                <option name="name" value="uninstallDebug" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Displays the signing info for each variant." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="signingReport" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="compileDebugAndroidTestAidl" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="mergeDebugAndroidTestShaders" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Deletes the build directory." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="clean" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
@@ -1114,279 +1842,437 @@
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="preDebugTestBuild" />
+                <option name="name" value="generateDebugBuildConfig" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Assembles and tests this project." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="build" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Assembles all Release builds." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="preDexDebug" />
+                <option name="name" value="assembleRelease" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="preDexDebugTest" />
+                <option name="name" value="compileDebugAndroidTestRenderscript" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="preDexRelease" />
+                <option name="name" value="generateDebugAndroidTestResources" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="preReleaseBuild" />
+                <option name="name" value="processDebugManifest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Prepare com.android.support:appcompat-v7:22.2.1" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="prepareComAndroidSupportAppcompatV72221Library" />
+                <option name="name" value="packageDebugAndroidTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Prepare com.android.support:support-v4:22.2.1" />
+                <option name="description" value="Prepare com.android.support:support-v4:25.0.0" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="prepareComAndroidSupportSupportV42221Library" />
+                <option name="name" value="prepareComAndroidSupportSupportV42500Library" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Prepare com.atinternet:Tracker:2.2.0" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="prepareComAtinternetTracker220Library" />
+                <option name="name" value="generateReleaseResValues" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Displays the properties of project ':TestApp'." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
+                <option name="name" value="properties" />
+              </ExternalTaskPojo>
+            </list>
+          </value>
+        </entry>
+        <entry key="$PROJECT_DIR$/Tracker">
+          <value>
+            <list>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="mergeDebugProguardFiles" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Displays the sub-projects of project ':Tracker'." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="projects" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="packageReleaseResources" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="validateSigningDebugAndroidTest" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Prepare com.google.android.gms:play-services-ads:10.2.1" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="prepareComGoogleAndroidGmsPlayServicesAds1021Library" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="transformNativeLibsWithSyncJniLibsForRelease" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="assembleReleaseUnitTest" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
                 <option name="name" value="prepareDebugDependencies" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="prepareDebugTestDependencies" />
+                <option name="description" value="Assembles a bundle containing the library in debug." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="bundleDebug" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="copyDebugLint" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="processReleaseJavaRes" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="generateReleaseAssets" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Runs lint on the Debug build." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="lintDebug" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Assembles a bundle containing the library in release." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="bundleRelease" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="assembleDebugUnitTest" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Creates a version of android.jar that's suitable for unit tests." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="mockableAndroidJar" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Displays the configuration model of project ':Tracker'. [incubating]" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="model" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Displays the tasks runnable from project ':Tracker'." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="tasks" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="compileDebugSources" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="packageReleaseRenderscript" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="mergeReleaseProguardFiles" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="incrementalDebugJavaCompilationSafeguard" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Prepare com.google.android.gms:play-services-gass:10.2.1" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="prepareComGoogleAndroidGmsPlayServicesGass1021Library" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="javadocJar" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Runs all device checks using Device Providers and Test Servers." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="deviceCheck" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Displays all dependencies declared in project ':Tracker'." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="dependencies" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="processDebugResources" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Runs lint on all variants." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="lint" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="compileReleaseNdk" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="generateDebugResources" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="compileDebugJavaWithJavac" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Installs the 'archives' artifacts into the local Maven repository." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="install" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Assembles and tests this project and all projects it depends on." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="buildNeeded" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="generateDebugAndroidTestBuildConfig" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="processDebugUnitTestJavaRes" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Run unit tests for the release build." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="testReleaseUnitTest" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Deletes the build cache directory." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="cleanBuildCache" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="prepareReleaseDependencies" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="assembleDefault" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="processDebugJavaRes" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="compileDebugAndroidTestShaders" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="processDebugManifest" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="mergeDebugShaders" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="processDebugResources" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="compileDebugAndroidTestJavaWithJavac" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="processDebugTestJavaRes" />
+                <option name="description" value="Displays the components produced by project ':Tracker'. [incubating]" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="components" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="processDebugTestManifest" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="compileReleaseRenderscript" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="processDebugTestResources" />
+                <option name="description" value="Assembles all Debug builds." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="assembleDebug" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="processReleaseJavaRes" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="processDebugAndroidTestManifest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="processReleaseManifest" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="compileDebugUnitTestJavaWithJavac" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="processReleaseResources" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="createProdDelivery" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Displays the signing info for each variant" />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="signingReport" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="transformResourcesWithMergeJavaResForReleaseUnitTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Uninstall all applications." />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="uninstallAll" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="preDebugAndroidTestBuild" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Uninstalls the Debug build" />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="uninstallDebug" />
+                <option name="description" value="Extracts Android annotations for the debug variant into the archive file" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="extractDebugAnnotations" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Uninstalls the Test build for the Debug build" />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="uninstallDebugTest" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="processDebugAndroidTestJavaRes" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Uninstalls the Release build" />
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="uninstallRelease" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="javadoc" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="validateDebugSigning" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="processReleaseUnitTestJavaRes" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/TestApp" />
-                <option name="name" value="zipalignDebug" />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="javaPreCompileDebugAndroidTest" />
               </ExternalTaskPojo>
-            </list>
-          </value>
-        </entry>
-        <entry key="$PROJECT_DIR$/Tracker">
-          <value>
-            <list>
               <ExternalTaskPojo>
-                <option name="description" value="Displays the Android dependencies of the project" />
+                <option name="description" value="Prepare com.android.support:support-v4:24.0.0" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="androidDependencies" />
+                <option name="name" value="prepareComAndroidSupportSupportV42400Library" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Assembles all variants of all applications and secondary packages." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="assemble" />
+                <option name="name" value="transformClassesAndResourcesWithSyncLibJarsForRelease" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Assembles all Debug builds" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="assembleDebug" />
+                <option name="name" value="compileReleaseShaders" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Assembles the Test build for the Debug build" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="assembleDebugTest" />
+                <option name="name" value="generateDebugAndroidTestSources" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="assembleDefault" />
+                <option name="name" value="prepareDebugAndroidTestDependencies" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Assembles all Release builds" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="assembleRelease" />
+                <option name="name" value="incrementalDebugAndroidTestJavaCompilationSafeguard" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Publishes artifacts to bintray.com." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="bintrayUpload" />
+                <option name="name" value="transformClassesAndResourcesWithSyncLibJarsForDebug" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Assembles and tests this project." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="build" />
+                <option name="name" value="checkReleaseManifest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Assembles and tests this project and all projects that depend on it." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="buildDependents" />
+                <option name="name" value="javaPreCompileDebugUnitTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Assembles and tests this project and all projects it depends on." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="buildNeeded" />
+                <option name="name" value="packageDebugResources" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Assembles a bundle containing the library in Debug." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="bundleDebug" />
+                <option name="name" value="transformNativeLibsWithSyncJniLibsForDebug" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Assembles a bundle containing the library in Release." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="bundleRelease" />
+                <option name="name" value="compileDebugAndroidTestSources" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Runs all checks." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="check" />
+                <option name="name" value="mergeReleaseJniLibFolders" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="checkDebugManifest" />
+                <option name="name" value="prepareReleaseDependencies" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="checkReleaseManifest" />
+                <option name="name" value="processReleaseResources" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Deletes the build directory." />
+                <option name="description" value="Installs and runs instrumentation tests using all Device Providers." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="clean" />
+                <option name="name" value="deviceAndroidTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="clearJar" />
+                <option name="name" value="mergeDebugAndroidTestAssets" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="compileDebugAidl" />
+                <option name="name" value="processReleaseManifest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Uninstalls the android (on device) tests for the Debug build." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="compileDebugJava" />
+                <option name="name" value="uninstallDebugAndroidTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Displays the insight into a specific dependency in project ':Tracker'." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="compileDebugNdk" />
+                <option name="name" value="dependencyInsight" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="compileDebugRenderscript" />
+                <option name="name" value="generateReleaseSources" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="compileDebugSources" />
+                <option name="name" value="incrementalReleaseUnitTestJavaCompilationSafeguard" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="compileDebugTestAidl" />
+                <option name="name" value="preReleaseBuild" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Assembles all variants of all applications and secondary packages." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="compileDebugTestJava" />
+                <option name="name" value="assemble" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="compileDebugTestNdk" />
+                <option name="name" value="incrementalDebugUnitTestJavaCompilationSafeguard" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="compileDebugTestRenderscript" />
+                <option name="name" value="incrementalReleaseJavaCompilationSafeguard" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Displays a help message." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="compileDebugTestSources" />
+                <option name="name" value="help" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="compileLint" />
+                <option name="name" value="compileReleaseUnitTestSources" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Prepare com.google.android.gms:play-services-clearcut:10.2.1" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="compileReleaseAidl" />
+                <option name="name" value="prepareComGoogleAndroidGmsPlayServicesClearcut1021Library" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Installs the android (on device) tests for the Debug build." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="compileReleaseJava" />
+                <option name="name" value="installDebugAndroidTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="compileReleaseNdk" />
+                <option name="name" value="mergeDebugAssets" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="compileReleaseRenderscript" />
+                <option name="name" value="clearDelivery" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="compileReleaseSources" />
+                <option name="name" value="javaPreCompileReleaseUnitTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="compileTestDebugJava" />
+                <option name="name" value="javaPreCompileRelease" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Installs and runs the tests for Build 'debug' on connected devices." />
+                <option name="description" value="Prepare com.google.android.gms:play-services-ads-lite:10.2.1" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="connectedAndroidTest" />
+                <option name="name" value="prepareComGoogleAndroidGmsPlayServicesAdsLite1021Library" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="description" value="Runs all device checks on currently connected devices." />
@@ -1394,26 +2280,27 @@
                 <option name="name" value="connectedCheck" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Installs and runs the tests for debug on connected devices." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="copyDebugLint" />
+                <option name="name" value="connectedDebugAndroidTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Uninstall all applications." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="copyReleaseLint" />
+                <option name="name" value="uninstallAll" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Runs all device checks using Device Providers and Test Servers." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="deviceCheck" />
+                <option name="name" value="transformNativeLibsWithMergeJniLibsForDebug" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Assembles all the Test applications." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="dexDebugTest" />
+                <option name="name" value="assembleAndroidTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Extracts Android annotations for the debug variant into the archive file" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="extractDebugAnnotations" />
+                <option name="name" value="processDebugAndroidTestResources" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="description" value="Extracts Android annotations for the release variant into the archive file" />
@@ -1422,301 +2309,310 @@
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="generateDebugAssets" />
+                <option name="name" value="compileDebugAidl" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Publishes artifacts to bintray.com." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="generateDebugBuildConfig" />
+                <option name="name" value="bintrayUpload" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="generateDebugResValues" />
+                <option name="name" value="preDebugUnitTestBuild" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="generateDebugResources" />
+                <option name="name" value="compileLint" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="generateDebugSources" />
+                <option name="name" value="generateDebugAndroidTestResValues" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="generateDebugTestAssets" />
+                <option name="name" value="transformNativeLibsWithMergeJniLibsForDebugAndroidTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="generateDebugTestBuildConfig" />
+                <option name="name" value="mergeReleaseShaders" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="generateDebugTestResValues" />
+                <option name="name" value="sourcesJar" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Displays the Android dependencies of the project." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="generateDebugTestResources" />
+                <option name="name" value="androidDependencies" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="generateDebugTestSources" />
+                <option name="name" value="compileDebugAndroidTestNdk" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="generateReleaseAssets" />
+                <option name="name" value="compileDebugUnitTestSources" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="generateReleaseBuildConfig" />
+                <option name="name" value="transformNativeLibsWithMergeJniLibsForRelease" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="generateReleaseResValues" />
+                <option name="name" value="generateDebugSources" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="generateReleaseResources" />
+                <option name="name" value="mergeDebugAndroidTestJniLibFolders" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="generateReleaseSources" />
+                <option name="name" value="extractProguardFiles" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Installs the 'archives' artifacts into the local Maven repository." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="install" />
+                <option name="name" value="transformClassesWithDexForDebugAndroidTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Installs the Test build for the Debug build" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="installDebugTest" />
+                <option name="name" value="assembleDebugAndroidTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="javadoc" />
+                <option name="name" value="copyReleaseLint" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="javadocJar" />
+                <option name="name" value="processDebugJavaRes" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Runs lint on all variants." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="lint" />
+                <option name="name" value="generateDebugAndroidTestAssets" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Runs lint on the Debug build" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="lintDebug" />
+                <option name="name" value="compileReleaseJavaWithJavac" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Runs lint on the Release build" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="lintRelease" />
+                <option name="name" value="transformResourcesWithMergeJavaResForDebugAndroidTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="makeJar" />
+                <option name="name" value="prepareReleaseUnitTestDependencies" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Run unit tests for all variants." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="mergeDebugAssets" />
+                <option name="name" value="test" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="mergeDebugProguardFiles" />
+                <option name="name" value="compileDebugNdk" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="mergeDebugResources" />
+                <option name="name" value="mergeDebugAndroidTestResources" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="mergeDebugTestAssets" />
+                <option name="name" value="preReleaseUnitTestBuild" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="mergeDebugTestResources" />
+                <option name="name" value="generateDebugResValues" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Runs all checks." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="mergeReleaseAssets" />
+                <option name="name" value="check" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="mergeReleaseProguardFiles" />
+                <option name="name" value="javaPreCompileDebug" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Prepare com.google.android.gms:play-services-base:10.2.1" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="mergeReleaseResources" />
+                <option name="name" value="prepareComGoogleAndroidGmsPlayServicesBase1021Library" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Run unit tests for the debug build." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="packageDebugJar" />
+                <option name="name" value="testDebugUnitTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Installs and runs instrumentation tests for all flavors on connected devices." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="packageDebugJniLibs" />
+                <option name="name" value="connectedAndroidTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="packageDebugLocalJar" />
+                <option name="name" value="preBuild" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="packageDebugRenderscript" />
+                <option name="name" value="transformResourcesWithMergeJavaResForRelease" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="packageDebugResources" />
+                <option name="name" value="compileReleaseSources" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="packageDebugTest" />
+                <option name="name" value="compileReleaseUnitTestJavaWithJavac" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="packageReleaseJar" />
+                <option name="name" value="compileDebugShaders" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="packageReleaseJniLibs" />
+                <option name="name" value="transformResourcesWithMergeJavaResForDebug" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="packageReleaseLocalJar" />
+                <option name="name" value="compileReleaseAidl" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Runs lint on the Release build." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="packageReleaseRenderscript" />
+                <option name="name" value="lintRelease" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Assembles and tests this project and all projects that depend on it." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="packageReleaseResources" />
+                <option name="name" value="buildDependents" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Prepare com.google.android.gms:play-services-tasks:10.2.1" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="preBuild" />
+                <option name="name" value="prepareComGoogleAndroidGmsPlayServicesTasks1021Library" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="preDebugBuild" />
+                <option name="name" value="generateDebugAssets" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Displays the dependent components of components in project ':Tracker'. [incubating]" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="preDebugTestBuild" />
+                <option name="name" value="dependentComponents" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Displays all buildscript dependencies declared in project ':Tracker'." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="preDexDebugTest" />
+                <option name="name" value="buildEnvironment" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="preReleaseBuild" />
+                <option name="name" value="checkDebugManifest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Prepare com.android.support:support-v4:23.0.0" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="prepareComAndroidSupportSupportV42300Library" />
+                <option name="name" value="mergeDebugJniLibFolders" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Prepare com.google.android.gms:play-services-ads:8.4.0" />
+                <option name="description" value="Prints out all the source sets defined in this project." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="prepareComGoogleAndroidGmsPlayServicesAds840Library" />
+                <option name="name" value="sourceSets" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Prepare com.google.android.gms:play-services-basement:8.4.0" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="prepareComGoogleAndroidGmsPlayServicesBasement840Library" />
+                <option name="name" value="transformResourcesWithMergeJavaResForDebugUnitTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="prepareDebugDependencies" />
+                <option name="name" value="mergeReleaseAssets" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="prepareDebugTestDependencies" />
+                <option name="name" value="compileDebugRenderscript" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="prepareReleaseDependencies" />
+                <option name="name" value="packageDebugRenderscript" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="processDebugJavaRes" />
+                <option name="name" value="generateReleaseBuildConfig" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="processDebugManifest" />
+                <option name="name" value="prepareDebugUnitTestDependencies" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Prepare com.google.android.gms:play-services-basement:10.2.1" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="processDebugResources" />
+                <option name="name" value="prepareComGoogleAndroidGmsPlayServicesBasement1021Library" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="processDebugTestJavaRes" />
+                <option name="name" value="createAlphaDelivery" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="processDebugTestManifest" />
+                <option name="name" value="generateReleaseResources" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Displays the signing info for each variant." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="processDebugTestResources" />
+                <option name="name" value="signingReport" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="processReleaseJavaRes" />
+                <option name="name" value="compileDebugAndroidTestAidl" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="processReleaseManifest" />
+                <option name="name" value="mergeDebugAndroidTestShaders" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Deletes the build directory." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="processReleaseResources" />
+                <option name="name" value="clean" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Processes JVM resources 'testDebug:resources'." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="processTestDebugResources" />
+                <option name="name" value="preDebugBuild" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Displays the signing info for each variant" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="signingReport" />
+                <option name="name" value="generateDebugBuildConfig" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
+                <option name="description" value="Assembles and tests this project." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="sourcesJar" />
+                <option name="name" value="build" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Runs all unit tests." />
+                <option name="description" value="Assembles all Release builds." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="test" />
+                <option name="name" value="assembleRelease" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Run unit tests for Build 'Debug'." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="testDebug" />
+                <option name="name" value="compileDebugAndroidTestRenderscript" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="testDebugClasses" />
+                <option name="name" value="generateDebugAndroidTestResources" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Uninstall all applications." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="uninstallAll" />
+                <option name="name" value="processDebugManifest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
-                <option name="description" value="Uninstalls the Test build for the Debug build" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="uninstallDebugTest" />
+                <option name="name" value="packageDebugAndroidTest" />
               </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
-                <option name="name" value="validateDebugSigning" />
+                <option name="name" value="generateReleaseResValues" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Displays the properties of project ':Tracker'." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/Tracker" />
+                <option name="name" value="properties" />
               </ExternalTaskPojo>
             </list>
           </value>
@@ -1725,7 +2621,7 @@
     </option>
     <option name="modificationStamps">
       <map>
-        <entry key="$PROJECT_DIR$" value="5806341138000" />
+        <entry key="$PROJECT_DIR$" value="5974945851000" />
       </map>
     </option>
     <option name="projectBuildClasspath">
@@ -1740,22 +2636,29 @@
                       <ExternalModuleBuildClasspathPojo>
                         <option name="entries">
                           <list>
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle/1.0.0/cc834d833ada2ae95c63eedfc87efcd2d842f3d6/gradle-1.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle/1.0.0/79f4ed9b6582ecec4d7b35aecfa45fbc48dadb96/gradle-1.0.0.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.robolectric/robolectric-gradle-plugin/0.14.1/dca03a2693b501a1a0571b7277f1458c6b989fcf/robolectric-gradle-plugin-0.14.1-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.robolectric/robolectric-gradle-plugin/0.14.1/4fbc325f7a6ff4f3000c8818a42e4f15558e122/robolectric-gradle-plugin-0.14.1.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.dcendents/android-maven-plugin/1.2/ae4a67f571536adcb932cebf731e45174231363e/android-maven-plugin-1.2-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.dcendents/android-maven-plugin/1.2/95655bd755e3bd8d43af63705f275c750e8b758e/android-maven-plugin-1.2.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jfrog.bintray.gradle/gradle-bintray-plugin/1.2/85566c4fd2f071635bca55847249587f34e2b13f/gradle-bintray-plugin-1.2-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jfrog.bintray.gradle/gradle-bintray-plugin/1.2/ae174b2aa348ae742cdc63496b66bcbc8f15d5e0/gradle-bintray-plugin-1.2.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/builder/1.0.0/5937e1bdf4c807a0c2adf3e1269838238d05da2b/builder-1.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/builder/1.0.0/528fdfb8a4d51ae4177e7d913e88767916a84758/builder-1.0.0.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.lint/lint/24.0.0/53093824fcd36168d0650952def5e050d65c384d/lint-24.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.lint/lint/24.0.0/e3d6e09a113af66fd2e5dc6e4d2321d7b0d82328/lint-24.0.0.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-gradle/5.1/proguard-gradle-5.1-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-gradle/5.1/proguard-gradle-5.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle/2.3.1/gradle-2.3.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.dcendents/android-maven-gradle-plugin/1.4.1/7dacbe575c1be3184de34b04aa42a571abeb3a8c/android-maven-gradle-plugin-1.4.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.dcendents/android-maven-gradle-plugin/1.4.1/a8ce7efbaaac042cfc3ce04e79eb12b2457ee334/android-maven-gradle-plugin-1.4.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jfrog.bintray.gradle/gradle-bintray-plugin/1.7/b9920fa27e99ebfb25cf4019bb76f8f5ecd58598/gradle-bintray-plugin-1.7-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jfrog.bintray.gradle/gradle-bintray-plugin/1.7/c67c5fe6fb62259d0b059cf550f40fe11c66012/gradle-bintray-plugin-1.7.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle-core/2.3.1/gradle-core-2.3.1.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.codehaus.groovy.modules.http-builder/http-builder/0.7.2/f1860181de06236f28f3f247aed57fa4631016d8/http-builder-0.7.2-sources.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.codehaus.groovy.modules.http-builder/http-builder/0.7.2/323092cd786480311c1cf693770f9e6fc20a8bef/http-builder-0.7.2.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-ant-tasks/2.1.3/49136cf7eb0e463e080ad2ebb0f65e91b19c8101/maven-ant-tasks-2.1.3-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-ant-tasks/2.1.3/b09be554228d66d208e5fef5266844aacf443abc/maven-ant-tasks-2.1.3.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder/2.3.1/builder-2.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint/25.3.1/lint-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/transform-api/2.0.0-deprecated-use-gradle-api/transform-api-2.0.0-deprecated-use-gradle-api.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle-api/2.3.1/gradle-api-2.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/databinding/compilerCommon/2.3.1/compilerCommon-2.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/5.0.4/asm-5.0.4-sources.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-commons/5.0.4/asm-commons-5.0.4.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-gradle/5.3.2/proguard-gradle-5.3.2.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jacoco/org.jacoco.core/0.7.5.201505241946/org.jacoco.core-0.7.5.201505241946.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jacoco/org.jacoco.report/0.7.5.201505241946/org.jacoco.report-0.7.5.201505241946.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/jopt-simple/jopt-simple/4.9/jopt-simple-4.9.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/protobuf/protobuf-java/3.0.0/protobuf-java-3.0.0.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpclient/4.2.1/6b27312b9c28b59aaeb6c21f3490045690c703d3/httpclient-4.2.1-sources.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpclient/4.2.1/b69bd03af60bf487b3ae1209a644ecac587bf6fc/httpclient-4.2.1.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.sf.json-lib/json-lib/2.3/f35340c0a0380141f62c72b76c8fb4bfa638d8c1/json-lib-2.3-jdk15.jar" />
@@ -1763,69 +2666,102 @@
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.sourceforge.nekohtml/nekohtml/1.9.16/61e35204e5a8fdb864152f84e2e3b33ab56f50ab/nekohtml-1.9.16.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/xml-resolver/xml-resolver/1.2/6b72432ea1c5296783007365bb7c9a6b39dfb730/xml-resolver-1.2-sources.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/xml-resolver/xml-resolver/1.2/3d0f97750b3a03e0971831566067754ba4bfd68c/xml-resolver-1.2.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpcore/4.2.1/3f6caf5334fa83607b82e2f32dd128a9d8a0ea5e/httpcore-4.2.1-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpcore/4.2.1/2d503272bf0a8b5f92d64db78b4ba9abbaccc6fd/httpcore-4.2.1.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.6/61e9f9d11fe3e12ec62f633006e99d75fd7f19c8/commons-codec-1.6-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.6/b7f0fc8f61ecadeb3695f0b9464755eee44374d4/commons-codec-1.6.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.8.0/2e585348c06d55d4c27c4afe46721fd5d6a43d9d/ant-1.8.0-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.8.0/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/ant-1.8.0.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/classworlds/classworlds/1.1-alpha-2/5adf2e681c57d7f48038b602f3ca2254ee82d47/classworlds-1.1-alpha-2.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.codehaus.plexus/plexus-container-default/1.0-alpha-9-stable-1/e9b8cdfbdca8f10c3d86f8c9ef16ab231bc379a7/plexus-container-default-1.0-alpha-9-stable-1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.codehaus.plexus/plexus-container-default/1.0-alpha-9-stable-1/94aea3010e250a334d9dab7f591114cd6c767458/plexus-container-default-1.0-alpha-9-stable-1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.codehaus.plexus/plexus-utils/1.5.15/1b1039b7725a6d1dd7b9f123acc5ad4b3b10d4ef/plexus-utils-1.5.15-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.codehaus.plexus/plexus-utils/1.5.15/c689598ce1eb94c304817877ed15911099972526/plexus-utils-1.5.15.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.codehaus.plexus/plexus-interpolation/1.11/80d47c6b183bd5ba343c36cf84d73daf28a31c64/plexus-interpolation-1.11-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.codehaus.plexus/plexus-interpolation/1.11/ad9dddff6043194904ad1d2c00ff1d003c3915f7/plexus-interpolation-1.11.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-artifact/2.2.1/2254a7c4df37ee565bb557e46325f8483942a368/maven-artifact-2.2.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-artifact/2.2.1/23600f790d4dab2cb965419eaa982e3e84c428f8/maven-artifact-2.2.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-artifact-manager/2.2.1/4cbd2b82fd13793898272e3efde94553e0a34766/maven-artifact-manager-2.2.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-artifact-manager/2.2.1/ec355b913c34d37080810f98e3f51abecbe1572b/maven-artifact-manager-2.2.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-model/2.2.1/3d7c035d8455862ea4e4d7df0f19f96426da8cd6/maven-model-2.2.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-model/2.2.1/c0a1c17436ec3ff5a56207c031d82277b4250a29/maven-model-2.2.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-project/2.2.1/48d00094f3534d54ac9103cc1e1ac0d19373f96d/maven-project-2.2.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-project/2.2.1/8239e98c16f641d55a4ad0e0bab0aee3aff8933f/maven-project-2.2.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-error-diagnostics/2.2.1/8a39928ed8627f01b9c36e0e2aea8915d5aef848/maven-error-diagnostics-2.2.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-error-diagnostics/2.2.1/e81bb342d7d172f23d108dc8fa979a1facdcde8e/maven-error-diagnostics-2.2.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-settings/2.2.1/9b5adc6a8a8de7bba166f189551630ed6c879c0/maven-settings-2.2.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-settings/2.2.1/2236ffe71fa5f78ce42b0f5fc22c54ed45f14294/maven-settings-2.2.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven.wagon/wagon-file/1.0-beta-6/9615a8a9e38f6303e863624c1391868d622ecb8/wagon-file-1.0-beta-6-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven.wagon/wagon-file/1.0-beta-6/6c53633505460caf49d2660de1e24744d915afb9/wagon-file-1.0-beta-6.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven.wagon/wagon-http-lightweight/1.0-beta-6/a7c0a4d1d9f226f4cff661117e2248fe93abc222/wagon-http-lightweight-1.0-beta-6-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven.wagon/wagon-http-lightweight/1.0-beta-6/b3815078570c3b1f0667e123d59717c6b726c6c2/wagon-http-lightweight-1.0-beta-6.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven.wagon/wagon-provider-api/1.0-beta-6/2ed36dee4bd5ed91a9ab12a4378189d97dddd932/wagon-provider-api-1.0-beta-6-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven.wagon/wagon-provider-api/1.0-beta-6/3f952e0282ae77ae59851d96bb18015e520b6208/wagon-provider-api-1.0-beta-6.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-model/2.3.1/builder-model-2.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-test-api/2.3.1/builder-test-api-2.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdklib/25.3.1/sdklib-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdk-common/25.3.1/sdk-common-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/common/25.3.1/common-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/manifest-merger/25.3.1/manifest-merger-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/ddms/ddmlib/25.3.1/ddmlib-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/jack/jack-api/0.13.0/jack-api-0.13.0.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/jill/jill-api/0.10.0/jill-api-0.10.0.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/analytics-library/protos/25.3.1/protos-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/analytics-library/shared/25.3.1/shared-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/analytics-library/tracker/25.3.1/tracker-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/squareup/javawriter/2.5.0/javawriter-2.5.0.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-tree/5.0.4/asm-tree-5.0.4.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-checks/25.3.1/lint-checks-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/eclipse/jdt/core/compiler/ecj/4.6.1/ecj-4.6.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/guava/guava/18.0/guava-18.0.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/databinding/baseLibrary/2.3.1/baseLibrary-2.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/antlr/antlr4/4.5.3/antlr4-4.5.3.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-io/commons-io/2.4/commons-io-2.4.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/googlecode/juniversalchardet/juniversalchardet/1.0.3/juniversalchardet-1.0.3.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/annotations/25.3.1/annotations-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-base/5.3.2/proguard-base-5.3.2.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-debug-all/5.0.1/asm-debug-all-5.0.1.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-beanutils/commons-beanutils/1.8.0/2818502bbb50bbcbd3f57e92a2bfe4d496f37688/commons-beanutils-1.8.0-sources.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-beanutils/commons-beanutils/1.8.0/c651d5103c649c12b20d53731643e5fffceb536/commons-beanutils-1.8.0.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-collections/commons-collections/3.2.1/fa095ef874374e5b2a11f8b06c26a5d68c7cb3a4/commons-collections-3.2.1-sources.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-collections/commons-collections/3.2.1/761ea405b9b37ced573d2df0d1e3a4e0f9edc668/commons-collections-3.2.1.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-lang/commons-lang/2.4/2b8c4b3035e45520ef42033e823c7d33e4b4402c/commons-lang-2.4-sources.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-lang/commons-lang/2.4/16313e02a793435009f1e458fa4af5d879f6fb11/commons-lang-2.4.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.sf.ezmorph/ezmorph/1.0.6/298992280d62b944afd0ae9bfe3329f5487dd434/ezmorph-1.0.6-sources.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.sf.ezmorph/ezmorph/1.0.6/1e55d2a0253ea37745d33062852fd2c90027432/ezmorph-1.0.6.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/xerces/xercesImpl/2.9.1/1136d197e2755bbde296ceee217ec5fe2917477b/xercesImpl-2.9.1.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/sdk-common/24.0.0/ea9eac1abbb8e43a76135e7aaf821e2b8ec39795/sdk-common-24.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/sdk-common/24.0.0/ebb1e063b8c370a88a38bf46036dce3892fe6c01/sdk-common-24.0.0.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/squareup/javawriter/2.5.0/javawriter-2.5.0-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/squareup/javawriter/2.5.0/javawriter-2.5.0.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/common/24.0.0/6ecc67ffd7b05df1977b5a94d7d6a7e4d00bff4c/common-24.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/common/24.0.0/271771234c82097345fb73c9571c403e22f62faf/common-24.0.0.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/builder-test-api/1.0.0/c42ebed2433b72f099bb697f56829bfcfc3a79e0/builder-test-api-1.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/builder-test-api/1.0.0/2d6ea74b74f8d928e468ff623825d22a5d8a1649/builder-test-api-1.0.0.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.ddms/ddmlib/24.0.0/7dfed086e2e0fdd5434179d1a631357ac1376de8/ddmlib-24.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.ddms/ddmlib/24.0.0/25b4cd0c917c47ce599008f4431ecffa0a57b51a/ddmlib-24.0.0.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/manifest-merger/24.0.0/ab95699556df591e0ba4d45666290b18883a1b9b/manifest-merger-24.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/manifest-merger/24.0.0/d0193672ed299817e4be2ba1caeeda4924b0e447/manifest-merger-24.0.0.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/builder-model/1.0.0/82702af4c805d26822b0465219f20821b815f529/builder-model-1.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/builder-model/1.0.0/2a3969a9082b47a4855395de918682eee946285a/builder-model-1.0.0.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/sdklib/24.0.0/13407e220c83f2fe2cc3386e139cf833d55b72fa/sdklib-24.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/sdklib/24.0.0/df228874ac1c933b64492bdbe2d9bab5ab434166/sdklib-24.0.0.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.lint/lint-checks/24.0.0/cc34e98c3842611e9ab9cc01617232e894671fee/lint-checks-24.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.lint/lint-checks/24.0.0/9cb8d9c675a7716ac6f4d20df0ef0aba0e4519f5/lint-checks-24.0.0.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.eclipse.jdt.core.compiler/ecj/4.2.2/fb9dc21349d06dd00b395af5c42f299df828f9da/ecj-4.2.2-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.eclipse.jdt.core.compiler/ecj/4.2.2/d9fd79499c664bccaf24dbe04be417de6c6af64a/ecj-4.2.2.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-base/5.1/proguard-base-5.1-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-base/5.1/proguard-base-5.1.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/guava/guava/17.0/guava-17.0-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/guava/guava/17.0/guava-17.0.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.layoutlib/layoutlib-api/24.0.0/e4d961e21d04d9888864269b31619ae8fee0341d/layoutlib-api-24.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.layoutlib/layoutlib-api/24.0.0/a43d5bf045da108875a860767c453078b0d77795/layoutlib-api-24.0.0.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/dvlib/24.0.0/4435987ff2ed5c04657e2aaf1be48b8ce33e907f/dvlib-24.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/dvlib/24.0.0/ae24752eb30a9154f5a3d822b64d28d709b9c30b/dvlib-24.0.0.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.8.0/8b53ba16fa62fb1034da8f1de200ddc407c8381/ant-launcher-1.8.0.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/3.8.1/525753763e53f6f76da052b316d0f2e3bfa4d73/junit-3.8.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/3.8.1/99129f16442844f6a4a11ae22fbbee40b14d774f/junit-3.8.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-repository-metadata/2.2.1/3b32786962e043891fc08265618c8b1d37c120b9/maven-repository-metadata-2.2.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-repository-metadata/2.2.1/98f0c07fcf1eeb213bef8d9316a9935184084b06/maven-repository-metadata-2.2.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/backport-util-concurrent/backport-util-concurrent/3.1/eff8366924cf1a666dd20aa632febf1c2c05b8cb/backport-util-concurrent-3.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/backport-util-concurrent/backport-util-concurrent/3.1/682f7ac17fed79e92f8e87d8455192b63376347b/backport-util-concurrent-3.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-profile/2.2.1/c20d767b267a679af494ee62c313e2ff8ba43116/maven-profile-2.2.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-profile/2.2.1/3950071587027e5086e9c395574a60650c432738/maven-profile-2.2.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-plugin-registry/2.2.1/4bb2899cf7f21818266035efab67a8cd5068ebd0/maven-plugin-registry-2.2.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-plugin-registry/2.2.1/72a24b7775649af78f3986b5aa7eb354b9674cfd/maven-plugin-registry-2.2.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven.wagon/wagon-http-shared/1.0-beta-6/18bd7878bf8ce32f353563190b2e88f1d45da470/wagon-http-shared-1.0-beta-6-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven.wagon/wagon-http-shared/1.0-beta-6/ccd70d7e0d8c085e648a83f072da06ca9a53be94/wagon-http-shared-1.0-beta-6.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/layoutlib/layoutlib-api/25.3.1/layoutlib-api-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/dvlib/25.3.1/dvlib-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/repository/25.3.1/repository-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/code/gson/gson/2.2.4/gson-2.2.4.jar" />
                             <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.lint/lint-api/24.0.0/78a156b170a550e48077b6cb3e46a5616d84437b/lint-api-24.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.lint/lint-api/24.0.0/f7b3b232bc6a2a48a48dd3aedb80113c82d6acba/lint-api-24.0.0.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/4.0/asm-4.0-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/4.0/asm-4.0.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.2/lombok-ast-0.2.2-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.2/lombok-ast-0.2.2.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-tree/4.0/asm-tree-4.0-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-api/25.3.1/lint-api-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-analysis/5.0.4/asm-analysis-5.0.4.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/nekohtml/xercesMinimal/1.9.6.2/d1c5e063683a0e6f77cd5f051a9d4af48346fa6/xercesMinimal-1.9.6.2.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/nekohtml/nekohtml/1.9.6.2/c007e4add79842d6b76f0b056ddb14e848424b86/nekohtml-1.9.6.2-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/nekohtml/nekohtml/1.9.6.2/2d960be7b62ae6622dbbbe49ab4ffdc609f85c80/nekohtml-1.9.6.2.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/intellij/annotations/12.0/annotations-12.0.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/jimfs/jimfs/1.1/jimfs-1.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpcore/4.2.1/3f6caf5334fa83607b82e2f32dd128a9d8a0ea5e/httpcore-4.2.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpcore/4.2.1/2d503272bf0a8b5f92d64db78b4ba9abbaccc6fd/httpcore-4.2.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.6/61e9f9d11fe3e12ec62f633006e99d75fd7f19c8/commons-codec-1.6-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.6/b7f0fc8f61ecadeb3695f0b9464755eee44374d4/commons-codec-1.6.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/com-intellij/uast/162.2228.14/uast-162.2228.14.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3.jar" />
                           </list>
                         </option>
                         <option name="path" value="$PROJECT_DIR$" />
@@ -1837,22 +2773,29 @@
                       <ExternalModuleBuildClasspathPojo>
                         <option name="entries">
                           <list>
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle/1.0.0/cc834d833ada2ae95c63eedfc87efcd2d842f3d6/gradle-1.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle/1.0.0/79f4ed9b6582ecec4d7b35aecfa45fbc48dadb96/gradle-1.0.0.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.robolectric/robolectric-gradle-plugin/0.14.1/dca03a2693b501a1a0571b7277f1458c6b989fcf/robolectric-gradle-plugin-0.14.1-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.robolectric/robolectric-gradle-plugin/0.14.1/4fbc325f7a6ff4f3000c8818a42e4f15558e122/robolectric-gradle-plugin-0.14.1.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.dcendents/android-maven-plugin/1.2/ae4a67f571536adcb932cebf731e45174231363e/android-maven-plugin-1.2-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.dcendents/android-maven-plugin/1.2/95655bd755e3bd8d43af63705f275c750e8b758e/android-maven-plugin-1.2.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jfrog.bintray.gradle/gradle-bintray-plugin/1.2/85566c4fd2f071635bca55847249587f34e2b13f/gradle-bintray-plugin-1.2-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jfrog.bintray.gradle/gradle-bintray-plugin/1.2/ae174b2aa348ae742cdc63496b66bcbc8f15d5e0/gradle-bintray-plugin-1.2.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/builder/1.0.0/5937e1bdf4c807a0c2adf3e1269838238d05da2b/builder-1.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/builder/1.0.0/528fdfb8a4d51ae4177e7d913e88767916a84758/builder-1.0.0.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.lint/lint/24.0.0/53093824fcd36168d0650952def5e050d65c384d/lint-24.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.lint/lint/24.0.0/e3d6e09a113af66fd2e5dc6e4d2321d7b0d82328/lint-24.0.0.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-gradle/5.1/proguard-gradle-5.1-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-gradle/5.1/proguard-gradle-5.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle/2.3.1/gradle-2.3.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.dcendents/android-maven-gradle-plugin/1.4.1/7dacbe575c1be3184de34b04aa42a571abeb3a8c/android-maven-gradle-plugin-1.4.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.dcendents/android-maven-gradle-plugin/1.4.1/a8ce7efbaaac042cfc3ce04e79eb12b2457ee334/android-maven-gradle-plugin-1.4.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jfrog.bintray.gradle/gradle-bintray-plugin/1.7/b9920fa27e99ebfb25cf4019bb76f8f5ecd58598/gradle-bintray-plugin-1.7-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jfrog.bintray.gradle/gradle-bintray-plugin/1.7/c67c5fe6fb62259d0b059cf550f40fe11c66012/gradle-bintray-plugin-1.7.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle-core/2.3.1/gradle-core-2.3.1.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.codehaus.groovy.modules.http-builder/http-builder/0.7.2/f1860181de06236f28f3f247aed57fa4631016d8/http-builder-0.7.2-sources.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.codehaus.groovy.modules.http-builder/http-builder/0.7.2/323092cd786480311c1cf693770f9e6fc20a8bef/http-builder-0.7.2.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-ant-tasks/2.1.3/49136cf7eb0e463e080ad2ebb0f65e91b19c8101/maven-ant-tasks-2.1.3-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-ant-tasks/2.1.3/b09be554228d66d208e5fef5266844aacf443abc/maven-ant-tasks-2.1.3.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder/2.3.1/builder-2.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint/25.3.1/lint-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/transform-api/2.0.0-deprecated-use-gradle-api/transform-api-2.0.0-deprecated-use-gradle-api.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle-api/2.3.1/gradle-api-2.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/databinding/compilerCommon/2.3.1/compilerCommon-2.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/5.0.4/asm-5.0.4-sources.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-commons/5.0.4/asm-commons-5.0.4.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-gradle/5.3.2/proguard-gradle-5.3.2.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jacoco/org.jacoco.core/0.7.5.201505241946/org.jacoco.core-0.7.5.201505241946.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jacoco/org.jacoco.report/0.7.5.201505241946/org.jacoco.report-0.7.5.201505241946.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/jopt-simple/jopt-simple/4.9/jopt-simple-4.9.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/protobuf/protobuf-java/3.0.0/protobuf-java-3.0.0.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpclient/4.2.1/6b27312b9c28b59aaeb6c21f3490045690c703d3/httpclient-4.2.1-sources.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpclient/4.2.1/b69bd03af60bf487b3ae1209a644ecac587bf6fc/httpclient-4.2.1.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.sf.json-lib/json-lib/2.3/f35340c0a0380141f62c72b76c8fb4bfa638d8c1/json-lib-2.3-jdk15.jar" />
@@ -1860,72 +2803,102 @@
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.sourceforge.nekohtml/nekohtml/1.9.16/61e35204e5a8fdb864152f84e2e3b33ab56f50ab/nekohtml-1.9.16.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/xml-resolver/xml-resolver/1.2/6b72432ea1c5296783007365bb7c9a6b39dfb730/xml-resolver-1.2-sources.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/xml-resolver/xml-resolver/1.2/3d0f97750b3a03e0971831566067754ba4bfd68c/xml-resolver-1.2.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpcore/4.2.1/3f6caf5334fa83607b82e2f32dd128a9d8a0ea5e/httpcore-4.2.1-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpcore/4.2.1/2d503272bf0a8b5f92d64db78b4ba9abbaccc6fd/httpcore-4.2.1.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.6/61e9f9d11fe3e12ec62f633006e99d75fd7f19c8/commons-codec-1.6-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.6/b7f0fc8f61ecadeb3695f0b9464755eee44374d4/commons-codec-1.6.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.8.0/2e585348c06d55d4c27c4afe46721fd5d6a43d9d/ant-1.8.0-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.8.0/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/ant-1.8.0.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/classworlds/classworlds/1.1-alpha-2/5adf2e681c57d7f48038b602f3ca2254ee82d47/classworlds-1.1-alpha-2.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.codehaus.plexus/plexus-container-default/1.0-alpha-9-stable-1/e9b8cdfbdca8f10c3d86f8c9ef16ab231bc379a7/plexus-container-default-1.0-alpha-9-stable-1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.codehaus.plexus/plexus-container-default/1.0-alpha-9-stable-1/94aea3010e250a334d9dab7f591114cd6c767458/plexus-container-default-1.0-alpha-9-stable-1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.codehaus.plexus/plexus-utils/1.5.15/1b1039b7725a6d1dd7b9f123acc5ad4b3b10d4ef/plexus-utils-1.5.15-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.codehaus.plexus/plexus-utils/1.5.15/c689598ce1eb94c304817877ed15911099972526/plexus-utils-1.5.15.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.codehaus.plexus/plexus-interpolation/1.11/80d47c6b183bd5ba343c36cf84d73daf28a31c64/plexus-interpolation-1.11-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.codehaus.plexus/plexus-interpolation/1.11/ad9dddff6043194904ad1d2c00ff1d003c3915f7/plexus-interpolation-1.11.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-artifact/2.2.1/2254a7c4df37ee565bb557e46325f8483942a368/maven-artifact-2.2.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-artifact/2.2.1/23600f790d4dab2cb965419eaa982e3e84c428f8/maven-artifact-2.2.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-artifact-manager/2.2.1/4cbd2b82fd13793898272e3efde94553e0a34766/maven-artifact-manager-2.2.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-artifact-manager/2.2.1/ec355b913c34d37080810f98e3f51abecbe1572b/maven-artifact-manager-2.2.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-model/2.2.1/3d7c035d8455862ea4e4d7df0f19f96426da8cd6/maven-model-2.2.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-model/2.2.1/c0a1c17436ec3ff5a56207c031d82277b4250a29/maven-model-2.2.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-project/2.2.1/48d00094f3534d54ac9103cc1e1ac0d19373f96d/maven-project-2.2.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-project/2.2.1/8239e98c16f641d55a4ad0e0bab0aee3aff8933f/maven-project-2.2.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-error-diagnostics/2.2.1/8a39928ed8627f01b9c36e0e2aea8915d5aef848/maven-error-diagnostics-2.2.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-error-diagnostics/2.2.1/e81bb342d7d172f23d108dc8fa979a1facdcde8e/maven-error-diagnostics-2.2.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-settings/2.2.1/9b5adc6a8a8de7bba166f189551630ed6c879c0/maven-settings-2.2.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-settings/2.2.1/2236ffe71fa5f78ce42b0f5fc22c54ed45f14294/maven-settings-2.2.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven.wagon/wagon-file/1.0-beta-6/9615a8a9e38f6303e863624c1391868d622ecb8/wagon-file-1.0-beta-6-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven.wagon/wagon-file/1.0-beta-6/6c53633505460caf49d2660de1e24744d915afb9/wagon-file-1.0-beta-6.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven.wagon/wagon-http-lightweight/1.0-beta-6/a7c0a4d1d9f226f4cff661117e2248fe93abc222/wagon-http-lightweight-1.0-beta-6-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven.wagon/wagon-http-lightweight/1.0-beta-6/b3815078570c3b1f0667e123d59717c6b726c6c2/wagon-http-lightweight-1.0-beta-6.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven.wagon/wagon-provider-api/1.0-beta-6/2ed36dee4bd5ed91a9ab12a4378189d97dddd932/wagon-provider-api-1.0-beta-6-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven.wagon/wagon-provider-api/1.0-beta-6/3f952e0282ae77ae59851d96bb18015e520b6208/wagon-provider-api-1.0-beta-6.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-model/2.3.1/builder-model-2.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-test-api/2.3.1/builder-test-api-2.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdklib/25.3.1/sdklib-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdk-common/25.3.1/sdk-common-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/common/25.3.1/common-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/manifest-merger/25.3.1/manifest-merger-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/ddms/ddmlib/25.3.1/ddmlib-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/jack/jack-api/0.13.0/jack-api-0.13.0.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/jill/jill-api/0.10.0/jill-api-0.10.0.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/analytics-library/protos/25.3.1/protos-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/analytics-library/shared/25.3.1/shared-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/analytics-library/tracker/25.3.1/tracker-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/squareup/javawriter/2.5.0/javawriter-2.5.0.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-tree/5.0.4/asm-tree-5.0.4.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-checks/25.3.1/lint-checks-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/eclipse/jdt/core/compiler/ecj/4.6.1/ecj-4.6.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/guava/guava/18.0/guava-18.0.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/databinding/baseLibrary/2.3.1/baseLibrary-2.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/antlr/antlr4/4.5.3/antlr4-4.5.3.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-io/commons-io/2.4/commons-io-2.4.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/googlecode/juniversalchardet/juniversalchardet/1.0.3/juniversalchardet-1.0.3.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/annotations/25.3.1/annotations-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-base/5.3.2/proguard-base-5.3.2.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-debug-all/5.0.1/asm-debug-all-5.0.1.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-beanutils/commons-beanutils/1.8.0/2818502bbb50bbcbd3f57e92a2bfe4d496f37688/commons-beanutils-1.8.0-sources.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-beanutils/commons-beanutils/1.8.0/c651d5103c649c12b20d53731643e5fffceb536/commons-beanutils-1.8.0.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-collections/commons-collections/3.2.1/fa095ef874374e5b2a11f8b06c26a5d68c7cb3a4/commons-collections-3.2.1-sources.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-collections/commons-collections/3.2.1/761ea405b9b37ced573d2df0d1e3a4e0f9edc668/commons-collections-3.2.1.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-lang/commons-lang/2.4/2b8c4b3035e45520ef42033e823c7d33e4b4402c/commons-lang-2.4-sources.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-lang/commons-lang/2.4/16313e02a793435009f1e458fa4af5d879f6fb11/commons-lang-2.4.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.sf.ezmorph/ezmorph/1.0.6/298992280d62b944afd0ae9bfe3329f5487dd434/ezmorph-1.0.6-sources.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.sf.ezmorph/ezmorph/1.0.6/1e55d2a0253ea37745d33062852fd2c90027432/ezmorph-1.0.6.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/xerces/xercesImpl/2.9.1/1136d197e2755bbde296ceee217ec5fe2917477b/xercesImpl-2.9.1.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/sdk-common/24.0.0/ea9eac1abbb8e43a76135e7aaf821e2b8ec39795/sdk-common-24.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/sdk-common/24.0.0/ebb1e063b8c370a88a38bf46036dce3892fe6c01/sdk-common-24.0.0.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/squareup/javawriter/2.5.0/javawriter-2.5.0-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/squareup/javawriter/2.5.0/javawriter-2.5.0.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/common/24.0.0/6ecc67ffd7b05df1977b5a94d7d6a7e4d00bff4c/common-24.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/common/24.0.0/271771234c82097345fb73c9571c403e22f62faf/common-24.0.0.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/builder-test-api/1.0.0/c42ebed2433b72f099bb697f56829bfcfc3a79e0/builder-test-api-1.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/builder-test-api/1.0.0/2d6ea74b74f8d928e468ff623825d22a5d8a1649/builder-test-api-1.0.0.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.ddms/ddmlib/24.0.0/7dfed086e2e0fdd5434179d1a631357ac1376de8/ddmlib-24.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.ddms/ddmlib/24.0.0/25b4cd0c917c47ce599008f4431ecffa0a57b51a/ddmlib-24.0.0.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/manifest-merger/24.0.0/ab95699556df591e0ba4d45666290b18883a1b9b/manifest-merger-24.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/manifest-merger/24.0.0/d0193672ed299817e4be2ba1caeeda4924b0e447/manifest-merger-24.0.0.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/builder-model/1.0.0/82702af4c805d26822b0465219f20821b815f529/builder-model-1.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/builder-model/1.0.0/2a3969a9082b47a4855395de918682eee946285a/builder-model-1.0.0.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/sdklib/24.0.0/13407e220c83f2fe2cc3386e139cf833d55b72fa/sdklib-24.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/sdklib/24.0.0/df228874ac1c933b64492bdbe2d9bab5ab434166/sdklib-24.0.0.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.lint/lint-checks/24.0.0/cc34e98c3842611e9ab9cc01617232e894671fee/lint-checks-24.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.lint/lint-checks/24.0.0/9cb8d9c675a7716ac6f4d20df0ef0aba0e4519f5/lint-checks-24.0.0.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.eclipse.jdt.core.compiler/ecj/4.2.2/fb9dc21349d06dd00b395af5c42f299df828f9da/ecj-4.2.2-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.eclipse.jdt.core.compiler/ecj/4.2.2/d9fd79499c664bccaf24dbe04be417de6c6af64a/ecj-4.2.2.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-base/5.1/proguard-base-5.1-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-base/5.1/proguard-base-5.1.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/guava/guava/17.0/guava-17.0-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/guava/guava/17.0/guava-17.0.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.layoutlib/layoutlib-api/24.0.0/e4d961e21d04d9888864269b31619ae8fee0341d/layoutlib-api-24.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.layoutlib/layoutlib-api/24.0.0/a43d5bf045da108875a860767c453078b0d77795/layoutlib-api-24.0.0.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/dvlib/24.0.0/4435987ff2ed5c04657e2aaf1be48b8ce33e907f/dvlib-24.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/dvlib/24.0.0/ae24752eb30a9154f5a3d822b64d28d709b9c30b/dvlib-24.0.0.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.8.0/8b53ba16fa62fb1034da8f1de200ddc407c8381/ant-launcher-1.8.0.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/3.8.1/525753763e53f6f76da052b316d0f2e3bfa4d73/junit-3.8.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/3.8.1/99129f16442844f6a4a11ae22fbbee40b14d774f/junit-3.8.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-repository-metadata/2.2.1/3b32786962e043891fc08265618c8b1d37c120b9/maven-repository-metadata-2.2.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-repository-metadata/2.2.1/98f0c07fcf1eeb213bef8d9316a9935184084b06/maven-repository-metadata-2.2.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/backport-util-concurrent/backport-util-concurrent/3.1/eff8366924cf1a666dd20aa632febf1c2c05b8cb/backport-util-concurrent-3.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/backport-util-concurrent/backport-util-concurrent/3.1/682f7ac17fed79e92f8e87d8455192b63376347b/backport-util-concurrent-3.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-profile/2.2.1/c20d767b267a679af494ee62c313e2ff8ba43116/maven-profile-2.2.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-profile/2.2.1/3950071587027e5086e9c395574a60650c432738/maven-profile-2.2.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-plugin-registry/2.2.1/4bb2899cf7f21818266035efab67a8cd5068ebd0/maven-plugin-registry-2.2.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-plugin-registry/2.2.1/72a24b7775649af78f3986b5aa7eb354b9674cfd/maven-plugin-registry-2.2.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven.wagon/wagon-http-shared/1.0-beta-6/18bd7878bf8ce32f353563190b2e88f1d45da470/wagon-http-shared-1.0-beta-6-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven.wagon/wagon-http-shared/1.0-beta-6/ccd70d7e0d8c085e648a83f072da06ca9a53be94/wagon-http-shared-1.0-beta-6.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/layoutlib/layoutlib-api/25.3.1/layoutlib-api-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/dvlib/25.3.1/dvlib-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/repository/25.3.1/repository-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/code/gson/gson/2.2.4/gson-2.2.4.jar" />
                             <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.lint/lint-api/24.0.0/78a156b170a550e48077b6cb3e46a5616d84437b/lint-api-24.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.lint/lint-api/24.0.0/f7b3b232bc6a2a48a48dd3aedb80113c82d6acba/lint-api-24.0.0.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/4.0/asm-4.0-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/4.0/asm-4.0.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.2/lombok-ast-0.2.2-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.2/lombok-ast-0.2.2.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-tree/4.0/asm-tree-4.0-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar" />
-                            <option value="$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/appcompat-v7/22.2.1/appcompat-v7-22.2.1.aar" />
-                            <option value="$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-v4/22.2.1/support-v4-22.2.1.aar" />
-                            <option value="$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/22.2.1/support-annotations-22.2.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-api/25.3.1/lint-api-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-analysis/5.0.4/asm-analysis-5.0.4.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/nekohtml/xercesMinimal/1.9.6.2/d1c5e063683a0e6f77cd5f051a9d4af48346fa6/xercesMinimal-1.9.6.2.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/nekohtml/nekohtml/1.9.6.2/c007e4add79842d6b76f0b056ddb14e848424b86/nekohtml-1.9.6.2-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/nekohtml/nekohtml/1.9.6.2/2d960be7b62ae6622dbbbe49ab4ffdc609f85c80/nekohtml-1.9.6.2.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/intellij/annotations/12.0/annotations-12.0.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/jimfs/jimfs/1.1/jimfs-1.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpcore/4.2.1/3f6caf5334fa83607b82e2f32dd128a9d8a0ea5e/httpcore-4.2.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpcore/4.2.1/2d503272bf0a8b5f92d64db78b4ba9abbaccc6fd/httpcore-4.2.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.6/61e9f9d11fe3e12ec62f633006e99d75fd7f19c8/commons-codec-1.6-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.6/b7f0fc8f61ecadeb3695f0b9464755eee44374d4/commons-codec-1.6.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/com-intellij/uast/162.2228.14/uast-162.2228.14.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3.jar" />
                           </list>
                         </option>
                         <option name="path" value="$PROJECT_DIR$/TestApp" />
@@ -1937,22 +2910,29 @@
                       <ExternalModuleBuildClasspathPojo>
                         <option name="entries">
                           <list>
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle/1.0.0/cc834d833ada2ae95c63eedfc87efcd2d842f3d6/gradle-1.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle/1.0.0/79f4ed9b6582ecec4d7b35aecfa45fbc48dadb96/gradle-1.0.0.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.robolectric/robolectric-gradle-plugin/0.14.1/dca03a2693b501a1a0571b7277f1458c6b989fcf/robolectric-gradle-plugin-0.14.1-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.robolectric/robolectric-gradle-plugin/0.14.1/4fbc325f7a6ff4f3000c8818a42e4f15558e122/robolectric-gradle-plugin-0.14.1.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.dcendents/android-maven-plugin/1.2/ae4a67f571536adcb932cebf731e45174231363e/android-maven-plugin-1.2-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.dcendents/android-maven-plugin/1.2/95655bd755e3bd8d43af63705f275c750e8b758e/android-maven-plugin-1.2.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jfrog.bintray.gradle/gradle-bintray-plugin/1.2/85566c4fd2f071635bca55847249587f34e2b13f/gradle-bintray-plugin-1.2-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jfrog.bintray.gradle/gradle-bintray-plugin/1.2/ae174b2aa348ae742cdc63496b66bcbc8f15d5e0/gradle-bintray-plugin-1.2.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/builder/1.0.0/5937e1bdf4c807a0c2adf3e1269838238d05da2b/builder-1.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/builder/1.0.0/528fdfb8a4d51ae4177e7d913e88767916a84758/builder-1.0.0.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.lint/lint/24.0.0/53093824fcd36168d0650952def5e050d65c384d/lint-24.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.lint/lint/24.0.0/e3d6e09a113af66fd2e5dc6e4d2321d7b0d82328/lint-24.0.0.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-gradle/5.1/proguard-gradle-5.1-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-gradle/5.1/proguard-gradle-5.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle/2.3.1/gradle-2.3.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.dcendents/android-maven-gradle-plugin/1.4.1/7dacbe575c1be3184de34b04aa42a571abeb3a8c/android-maven-gradle-plugin-1.4.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.dcendents/android-maven-gradle-plugin/1.4.1/a8ce7efbaaac042cfc3ce04e79eb12b2457ee334/android-maven-gradle-plugin-1.4.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jfrog.bintray.gradle/gradle-bintray-plugin/1.7/b9920fa27e99ebfb25cf4019bb76f8f5ecd58598/gradle-bintray-plugin-1.7-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jfrog.bintray.gradle/gradle-bintray-plugin/1.7/c67c5fe6fb62259d0b059cf550f40fe11c66012/gradle-bintray-plugin-1.7.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle-core/2.3.1/gradle-core-2.3.1.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.codehaus.groovy.modules.http-builder/http-builder/0.7.2/f1860181de06236f28f3f247aed57fa4631016d8/http-builder-0.7.2-sources.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.codehaus.groovy.modules.http-builder/http-builder/0.7.2/323092cd786480311c1cf693770f9e6fc20a8bef/http-builder-0.7.2.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-ant-tasks/2.1.3/49136cf7eb0e463e080ad2ebb0f65e91b19c8101/maven-ant-tasks-2.1.3-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-ant-tasks/2.1.3/b09be554228d66d208e5fef5266844aacf443abc/maven-ant-tasks-2.1.3.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder/2.3.1/builder-2.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint/25.3.1/lint-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/transform-api/2.0.0-deprecated-use-gradle-api/transform-api-2.0.0-deprecated-use-gradle-api.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle-api/2.3.1/gradle-api-2.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/databinding/compilerCommon/2.3.1/compilerCommon-2.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/5.0.4/asm-5.0.4-sources.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-commons/5.0.4/asm-commons-5.0.4.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-gradle/5.3.2/proguard-gradle-5.3.2.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jacoco/org.jacoco.core/0.7.5.201505241946/org.jacoco.core-0.7.5.201505241946.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jacoco/org.jacoco.report/0.7.5.201505241946/org.jacoco.report-0.7.5.201505241946.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/jopt-simple/jopt-simple/4.9/jopt-simple-4.9.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/protobuf/protobuf-java/3.0.0/protobuf-java-3.0.0.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpclient/4.2.1/6b27312b9c28b59aaeb6c21f3490045690c703d3/httpclient-4.2.1-sources.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpclient/4.2.1/b69bd03af60bf487b3ae1209a644ecac587bf6fc/httpclient-4.2.1.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.sf.json-lib/json-lib/2.3/f35340c0a0380141f62c72b76c8fb4bfa638d8c1/json-lib-2.3-jdk15.jar" />
@@ -1960,69 +2940,102 @@
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.sourceforge.nekohtml/nekohtml/1.9.16/61e35204e5a8fdb864152f84e2e3b33ab56f50ab/nekohtml-1.9.16.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/xml-resolver/xml-resolver/1.2/6b72432ea1c5296783007365bb7c9a6b39dfb730/xml-resolver-1.2-sources.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/xml-resolver/xml-resolver/1.2/3d0f97750b3a03e0971831566067754ba4bfd68c/xml-resolver-1.2.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpcore/4.2.1/3f6caf5334fa83607b82e2f32dd128a9d8a0ea5e/httpcore-4.2.1-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpcore/4.2.1/2d503272bf0a8b5f92d64db78b4ba9abbaccc6fd/httpcore-4.2.1.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.6/61e9f9d11fe3e12ec62f633006e99d75fd7f19c8/commons-codec-1.6-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.6/b7f0fc8f61ecadeb3695f0b9464755eee44374d4/commons-codec-1.6.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.8.0/2e585348c06d55d4c27c4afe46721fd5d6a43d9d/ant-1.8.0-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.8.0/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/ant-1.8.0.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/classworlds/classworlds/1.1-alpha-2/5adf2e681c57d7f48038b602f3ca2254ee82d47/classworlds-1.1-alpha-2.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.codehaus.plexus/plexus-container-default/1.0-alpha-9-stable-1/e9b8cdfbdca8f10c3d86f8c9ef16ab231bc379a7/plexus-container-default-1.0-alpha-9-stable-1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.codehaus.plexus/plexus-container-default/1.0-alpha-9-stable-1/94aea3010e250a334d9dab7f591114cd6c767458/plexus-container-default-1.0-alpha-9-stable-1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.codehaus.plexus/plexus-utils/1.5.15/1b1039b7725a6d1dd7b9f123acc5ad4b3b10d4ef/plexus-utils-1.5.15-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.codehaus.plexus/plexus-utils/1.5.15/c689598ce1eb94c304817877ed15911099972526/plexus-utils-1.5.15.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.codehaus.plexus/plexus-interpolation/1.11/80d47c6b183bd5ba343c36cf84d73daf28a31c64/plexus-interpolation-1.11-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.codehaus.plexus/plexus-interpolation/1.11/ad9dddff6043194904ad1d2c00ff1d003c3915f7/plexus-interpolation-1.11.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-artifact/2.2.1/2254a7c4df37ee565bb557e46325f8483942a368/maven-artifact-2.2.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-artifact/2.2.1/23600f790d4dab2cb965419eaa982e3e84c428f8/maven-artifact-2.2.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-artifact-manager/2.2.1/4cbd2b82fd13793898272e3efde94553e0a34766/maven-artifact-manager-2.2.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-artifact-manager/2.2.1/ec355b913c34d37080810f98e3f51abecbe1572b/maven-artifact-manager-2.2.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-model/2.2.1/3d7c035d8455862ea4e4d7df0f19f96426da8cd6/maven-model-2.2.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-model/2.2.1/c0a1c17436ec3ff5a56207c031d82277b4250a29/maven-model-2.2.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-project/2.2.1/48d00094f3534d54ac9103cc1e1ac0d19373f96d/maven-project-2.2.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-project/2.2.1/8239e98c16f641d55a4ad0e0bab0aee3aff8933f/maven-project-2.2.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-error-diagnostics/2.2.1/8a39928ed8627f01b9c36e0e2aea8915d5aef848/maven-error-diagnostics-2.2.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-error-diagnostics/2.2.1/e81bb342d7d172f23d108dc8fa979a1facdcde8e/maven-error-diagnostics-2.2.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-settings/2.2.1/9b5adc6a8a8de7bba166f189551630ed6c879c0/maven-settings-2.2.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-settings/2.2.1/2236ffe71fa5f78ce42b0f5fc22c54ed45f14294/maven-settings-2.2.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven.wagon/wagon-file/1.0-beta-6/9615a8a9e38f6303e863624c1391868d622ecb8/wagon-file-1.0-beta-6-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven.wagon/wagon-file/1.0-beta-6/6c53633505460caf49d2660de1e24744d915afb9/wagon-file-1.0-beta-6.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven.wagon/wagon-http-lightweight/1.0-beta-6/a7c0a4d1d9f226f4cff661117e2248fe93abc222/wagon-http-lightweight-1.0-beta-6-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven.wagon/wagon-http-lightweight/1.0-beta-6/b3815078570c3b1f0667e123d59717c6b726c6c2/wagon-http-lightweight-1.0-beta-6.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven.wagon/wagon-provider-api/1.0-beta-6/2ed36dee4bd5ed91a9ab12a4378189d97dddd932/wagon-provider-api-1.0-beta-6-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven.wagon/wagon-provider-api/1.0-beta-6/3f952e0282ae77ae59851d96bb18015e520b6208/wagon-provider-api-1.0-beta-6.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-model/2.3.1/builder-model-2.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-test-api/2.3.1/builder-test-api-2.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdklib/25.3.1/sdklib-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdk-common/25.3.1/sdk-common-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/common/25.3.1/common-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/manifest-merger/25.3.1/manifest-merger-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/ddms/ddmlib/25.3.1/ddmlib-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/jack/jack-api/0.13.0/jack-api-0.13.0.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/jill/jill-api/0.10.0/jill-api-0.10.0.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/analytics-library/protos/25.3.1/protos-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/analytics-library/shared/25.3.1/shared-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/analytics-library/tracker/25.3.1/tracker-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/squareup/javawriter/2.5.0/javawriter-2.5.0.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-tree/5.0.4/asm-tree-5.0.4.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-checks/25.3.1/lint-checks-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/eclipse/jdt/core/compiler/ecj/4.6.1/ecj-4.6.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/guava/guava/18.0/guava-18.0.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/databinding/baseLibrary/2.3.1/baseLibrary-2.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/antlr/antlr4/4.5.3/antlr4-4.5.3.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-io/commons-io/2.4/commons-io-2.4.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/googlecode/juniversalchardet/juniversalchardet/1.0.3/juniversalchardet-1.0.3.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/annotations/25.3.1/annotations-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-base/5.3.2/proguard-base-5.3.2.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-debug-all/5.0.1/asm-debug-all-5.0.1.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-beanutils/commons-beanutils/1.8.0/2818502bbb50bbcbd3f57e92a2bfe4d496f37688/commons-beanutils-1.8.0-sources.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-beanutils/commons-beanutils/1.8.0/c651d5103c649c12b20d53731643e5fffceb536/commons-beanutils-1.8.0.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-collections/commons-collections/3.2.1/fa095ef874374e5b2a11f8b06c26a5d68c7cb3a4/commons-collections-3.2.1-sources.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-collections/commons-collections/3.2.1/761ea405b9b37ced573d2df0d1e3a4e0f9edc668/commons-collections-3.2.1.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-lang/commons-lang/2.4/2b8c4b3035e45520ef42033e823c7d33e4b4402c/commons-lang-2.4-sources.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-lang/commons-lang/2.4/16313e02a793435009f1e458fa4af5d879f6fb11/commons-lang-2.4.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.sf.ezmorph/ezmorph/1.0.6/298992280d62b944afd0ae9bfe3329f5487dd434/ezmorph-1.0.6-sources.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.sf.ezmorph/ezmorph/1.0.6/1e55d2a0253ea37745d33062852fd2c90027432/ezmorph-1.0.6.jar" />
                             <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/xerces/xercesImpl/2.9.1/1136d197e2755bbde296ceee217ec5fe2917477b/xercesImpl-2.9.1.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/sdk-common/24.0.0/ea9eac1abbb8e43a76135e7aaf821e2b8ec39795/sdk-common-24.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/sdk-common/24.0.0/ebb1e063b8c370a88a38bf46036dce3892fe6c01/sdk-common-24.0.0.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/squareup/javawriter/2.5.0/javawriter-2.5.0-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/squareup/javawriter/2.5.0/javawriter-2.5.0.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/common/24.0.0/6ecc67ffd7b05df1977b5a94d7d6a7e4d00bff4c/common-24.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/common/24.0.0/271771234c82097345fb73c9571c403e22f62faf/common-24.0.0.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/builder-test-api/1.0.0/c42ebed2433b72f099bb697f56829bfcfc3a79e0/builder-test-api-1.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/builder-test-api/1.0.0/2d6ea74b74f8d928e468ff623825d22a5d8a1649/builder-test-api-1.0.0.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.ddms/ddmlib/24.0.0/7dfed086e2e0fdd5434179d1a631357ac1376de8/ddmlib-24.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.ddms/ddmlib/24.0.0/25b4cd0c917c47ce599008f4431ecffa0a57b51a/ddmlib-24.0.0.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/manifest-merger/24.0.0/ab95699556df591e0ba4d45666290b18883a1b9b/manifest-merger-24.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/manifest-merger/24.0.0/d0193672ed299817e4be2ba1caeeda4924b0e447/manifest-merger-24.0.0.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/builder-model/1.0.0/82702af4c805d26822b0465219f20821b815f529/builder-model-1.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/builder-model/1.0.0/2a3969a9082b47a4855395de918682eee946285a/builder-model-1.0.0.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/sdklib/24.0.0/13407e220c83f2fe2cc3386e139cf833d55b72fa/sdklib-24.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/sdklib/24.0.0/df228874ac1c933b64492bdbe2d9bab5ab434166/sdklib-24.0.0.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.lint/lint-checks/24.0.0/cc34e98c3842611e9ab9cc01617232e894671fee/lint-checks-24.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.lint/lint-checks/24.0.0/9cb8d9c675a7716ac6f4d20df0ef0aba0e4519f5/lint-checks-24.0.0.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.eclipse.jdt.core.compiler/ecj/4.2.2/fb9dc21349d06dd00b395af5c42f299df828f9da/ecj-4.2.2-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.eclipse.jdt.core.compiler/ecj/4.2.2/d9fd79499c664bccaf24dbe04be417de6c6af64a/ecj-4.2.2.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-base/5.1/proguard-base-5.1-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-base/5.1/proguard-base-5.1.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/guava/guava/17.0/guava-17.0-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/guava/guava/17.0/guava-17.0.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.layoutlib/layoutlib-api/24.0.0/e4d961e21d04d9888864269b31619ae8fee0341d/layoutlib-api-24.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.layoutlib/layoutlib-api/24.0.0/a43d5bf045da108875a860767c453078b0d77795/layoutlib-api-24.0.0.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/dvlib/24.0.0/4435987ff2ed5c04657e2aaf1be48b8ce33e907f/dvlib-24.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/dvlib/24.0.0/ae24752eb30a9154f5a3d822b64d28d709b9c30b/dvlib-24.0.0.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.8.0/8b53ba16fa62fb1034da8f1de200ddc407c8381/ant-launcher-1.8.0.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/3.8.1/525753763e53f6f76da052b316d0f2e3bfa4d73/junit-3.8.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/3.8.1/99129f16442844f6a4a11ae22fbbee40b14d774f/junit-3.8.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-repository-metadata/2.2.1/3b32786962e043891fc08265618c8b1d37c120b9/maven-repository-metadata-2.2.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-repository-metadata/2.2.1/98f0c07fcf1eeb213bef8d9316a9935184084b06/maven-repository-metadata-2.2.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/backport-util-concurrent/backport-util-concurrent/3.1/eff8366924cf1a666dd20aa632febf1c2c05b8cb/backport-util-concurrent-3.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/backport-util-concurrent/backport-util-concurrent/3.1/682f7ac17fed79e92f8e87d8455192b63376347b/backport-util-concurrent-3.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-profile/2.2.1/c20d767b267a679af494ee62c313e2ff8ba43116/maven-profile-2.2.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-profile/2.2.1/3950071587027e5086e9c395574a60650c432738/maven-profile-2.2.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-plugin-registry/2.2.1/4bb2899cf7f21818266035efab67a8cd5068ebd0/maven-plugin-registry-2.2.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-plugin-registry/2.2.1/72a24b7775649af78f3986b5aa7eb354b9674cfd/maven-plugin-registry-2.2.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven.wagon/wagon-http-shared/1.0-beta-6/18bd7878bf8ce32f353563190b2e88f1d45da470/wagon-http-shared-1.0-beta-6-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.maven.wagon/wagon-http-shared/1.0-beta-6/ccd70d7e0d8c085e648a83f072da06ca9a53be94/wagon-http-shared-1.0-beta-6.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/layoutlib/layoutlib-api/25.3.1/layoutlib-api-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/dvlib/25.3.1/dvlib-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/repository/25.3.1/repository-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/code/gson/gson/2.2.4/gson-2.2.4.jar" />
                             <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.lint/lint-api/24.0.0/78a156b170a550e48077b6cb3e46a5616d84437b/lint-api-24.0.0-sources.jar" />
-                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.lint/lint-api/24.0.0/f7b3b232bc6a2a48a48dd3aedb80113c82d6acba/lint-api-24.0.0.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/4.0/asm-4.0-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/4.0/asm-4.0.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.2/lombok-ast-0.2.2-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.2/lombok-ast-0.2.2.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-tree/4.0/asm-tree-4.0-sources.jar" />
-                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-api/25.3.1/lint-api-25.3.1.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-analysis/5.0.4/asm-analysis-5.0.4.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/nekohtml/xercesMinimal/1.9.6.2/d1c5e063683a0e6f77cd5f051a9d4af48346fa6/xercesMinimal-1.9.6.2.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/nekohtml/nekohtml/1.9.6.2/c007e4add79842d6b76f0b056ddb14e848424b86/nekohtml-1.9.6.2-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/nekohtml/nekohtml/1.9.6.2/2d960be7b62ae6622dbbbe49ab4ffdc609f85c80/nekohtml-1.9.6.2.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/intellij/annotations/12.0/annotations-12.0.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/jimfs/jimfs/1.1/jimfs-1.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpcore/4.2.1/3f6caf5334fa83607b82e2f32dd128a9d8a0ea5e/httpcore-4.2.1-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpcore/4.2.1/2d503272bf0a8b5f92d64db78b4ba9abbaccc6fd/httpcore-4.2.1.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.6/61e9f9d11fe3e12ec62f633006e99d75fd7f19c8/commons-codec-1.6-sources.jar" />
+                            <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.6/b7f0fc8f61ecadeb3695f0b9464755eee44374d4/commons-codec-1.6.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/com-intellij/uast/162.2228.14/uast-162.2228.14.jar" />
+                            <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3.jar" />
                           </list>
                         </option>
                         <option name="path" value="$PROJECT_DIR$/Tracker" />
@@ -2034,108 +3047,141 @@
               <option name="name" value="ATMobileAnalytics" />
               <option name="projectBuildClasspath">
                 <list>
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/announce" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/antlr" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/base-services" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/base-services-groovy" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/build-comparison" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/build-init" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/cli" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/code-quality" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/core" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/cunit" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/dependency-management" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/diagnostics" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/ear" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/ide" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/ide-native" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/internal-integ-testing" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/internal-testing" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/ivy" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/jacoco" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/javascript" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/jetty" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/language-groovy" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/language-java" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/language-jvm" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/language-native" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/launcher" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/maven" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/messaging" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/model-core" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/model-groovy" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/native" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/open-api" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/osgi" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/platform-base" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/platform-jvm" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/platform-native" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/plugin-development" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/plugin-use" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/plugins" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/publish" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/reporting" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/resources" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/resources-http" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/scala" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/signing" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/sonar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/tooling-api" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/ui" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/src/wrapper" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/ant-1.9.3.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/ant-launcher-1.9.3.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/gradle-base-services-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/gradle-base-services-groovy-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/gradle-cli-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/gradle-core-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/gradle-docs-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/gradle-launcher-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/gradle-messaging-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/gradle-model-core-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/gradle-model-groovy-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/gradle-native-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/gradle-open-api-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/gradle-resources-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/gradle-tooling-api-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/gradle-ui-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/gradle-wrapper-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/groovy-all-2.3.6.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/plugins/ant-antlr-1.9.3.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/plugins/gradle-announce-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/plugins/gradle-antlr-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/plugins/gradle-build-comparison-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/plugins/gradle-build-init-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/plugins/gradle-code-quality-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/plugins/gradle-cunit-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/plugins/gradle-dependency-management-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/plugins/gradle-diagnostics-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/plugins/gradle-ear-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/plugins/gradle-ide-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/plugins/gradle-ide-native-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/plugins/gradle-ivy-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/plugins/gradle-jacoco-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/plugins/gradle-javascript-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/plugins/gradle-jetty-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/plugins/gradle-language-groovy-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/plugins/gradle-language-java-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/plugins/gradle-language-jvm-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/plugins/gradle-language-native-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/plugins/gradle-maven-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/plugins/gradle-osgi-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/plugins/gradle-platform-base-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/plugins/gradle-platform-jvm-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/plugins/gradle-platform-native-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/plugins/gradle-plugin-development-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/plugins/gradle-plugin-use-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/plugins/gradle-plugins-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/plugins/gradle-publish-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/plugins/gradle-reporting-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/plugins/gradle-resources-http-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/plugins/gradle-scala-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/plugins/gradle-signing-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/plugins/gradle-sonar-2.2.jar" />
-                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-2.2-all/1vevkra640w3rb9hkuw50q5we/gradle-2.2/lib/plugins/ivy-2.2.0.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/announce" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/antlr" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/base-services" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/base-services-groovy" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/build-cache-http" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/build-comparison" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/build-init" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/cli" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/code-quality" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/composite-builds" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/core" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/dependency-management" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/diagnostics" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/ear" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/ide" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/ide-native" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/ide-play" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/installation-beacon" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/internal-android-performance-testing" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/internal-integ-testing" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/internal-performance-testing" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/internal-testing" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/ivy" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/jacoco" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/javascript" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/jetty" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/jvm-services" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/language-groovy" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/language-java" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/language-jvm" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/language-native" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/language-scala" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/launcher" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/logging" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/maven" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/messaging" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/model-core" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/model-groovy" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/native" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/open-api" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/osgi" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/platform-base" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/platform-jvm" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/platform-native" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/platform-play" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/plugin-development" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/plugin-use" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/plugins" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/process-services" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/publish" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/reporting" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/resources" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/resources-http" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/resources-s3" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/resources-sftp" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/scala" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/signing" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/test-kit" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/testing-base" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/testing-jvm" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/testing-native" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/tooling-api" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/tooling-api-builders" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/ui" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/workers" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/wrapper" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/ant-1.9.6.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/ant-launcher-1.9.6.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-base-services-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-base-services-groovy-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-cli-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-core-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-docs-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-installation-beacon-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-jvm-services-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-launcher-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-logging-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-messaging-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-model-core-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-model-groovy-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-native-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-open-api-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-process-services-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-resources-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-script-kotlin-0.5.1.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-tooling-api-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-ui-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-version-info-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-wrapper-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/groovy-all-2.4.7.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-announce-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-antlr-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-build-cache-http-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-build-comparison-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-build-init-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-code-quality-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-composite-builds-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-dependency-management-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-diagnostics-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-ear-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-ide-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-ide-native-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-ide-play-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-ivy-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-jacoco-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-javascript-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-jetty-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-language-groovy-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-language-java-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-language-jvm-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-language-native-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-language-scala-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-maven-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-osgi-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-platform-base-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-platform-jvm-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-platform-native-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-platform-play-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-plugin-development-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-plugin-use-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-plugins-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-publish-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-reporting-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-resources-http-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-resources-s3-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-resources-sftp-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-scala-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-signing-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-test-kit-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-testing-base-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-testing-jvm-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-testing-native-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-tooling-api-builders-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-workers-3.3.jar" />
+                  <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/ivy-2.2.0.jar" />
                   <option value="$PROJECT_DIR$/buildSrc/src/main/java" />
                   <option value="$PROJECT_DIR$/buildSrc/src/main/groovy" />
                 </list>
@@ -2196,9 +3242,9 @@
     </option>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="y" value="23" />
-    <option name="width" value="1280" />
-    <option name="height" value="720" />
+    <option name="y" value="22" />
+    <option name="width" value="1680" />
+    <option name="height" value="970" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
@@ -2275,10 +3321,6 @@
               <option name="myItemId" value="src" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -2301,14 +3343,6 @@
               <option name="myItemId" value="main" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="tracker" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -2327,60 +3361,6 @@
               <option name="myItemId" value="src" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="ATMobileAnalytics" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="ATMobileAnalytics" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="TestApp" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="ATMobileAnalytics" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="ATMobileAnalytics" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="TestApp" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="ATMobileAnalytics" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="ATMobileAnalytics" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="TestApp" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
             <PATH_ELEMENT>
               <option name="myItemId" value="main" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
@@ -2390,32 +3370,14 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="atinternet" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="ATMobileAnalytics" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="ATMobileAnalytics" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="TestApp" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
+              <option name="myItemId" value="tracker" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
-      <pane id="Scope" />
       <pane id="Scratches" />
+      <pane id="Scope" />
       <pane id="AndroidView">
         <subPane>
           <PATH>
@@ -2446,7 +3408,7 @@
     <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="Android_Wear_Square_API_20" />
     <property name="device.picker.selection" value="192.168.56.101:5555" />
   </component>
-  <component name="RunManager" selected="Gradle.ATMobileAnalytics:Tracker [test]">
+  <component name="RunManager" selected="Android App.TestApp">
     <configuration default="false" name="ATMobileAnalytics:Tracker [clean]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
       <ExternalSystemSettings>
         <option name="executionName" />
@@ -2483,104 +3445,75 @@
       </ExternalSystemSettings>
       <method />
     </configuration>
-    <configuration default="false" name="setConfigTest()" type="AndroidTestRunConfigurationType" factoryName="Android Tests" temporary="true" nameIsGenerated="true">
-      <module name="Tracker" />
-      <option name="TESTING_TYPE" value="3" />
-      <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
-      <option name="METHOD_NAME" value="setConfigTest" />
-      <option name="CLASS_NAME" value="com.atinternet.tracker.TrackerTest" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="EXTRA_OPTIONS" value="" />
-      <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-      <option name="PREFERRED_AVD" value="" />
-      <option name="CLEAR_LOGCAT" value="false" />
-      <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
-      <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
-      <option name="FORCE_STOP_RUNNING_APP" value="true" />
-      <option name="DEBUGGER_TYPE" value="Java" />
-      <option name="USE_LAST_SELECTED_DEVICE" value="false" />
-      <option name="PREFERRED_AVD" value="" />
-      <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="0" />
-      <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
-      <Hybrid>
-        <option name="WORKING_DIR" value="" />
-        <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      </Hybrid>
-      <Native>
-        <option name="WORKING_DIR" value="" />
-        <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      </Native>
-      <Java />
-      <Profilers>
-        <option name="GAPID_DISABLE_PCS" value="false" />
-      </Profilers>
-      <method />
+    <configuration default="true" type="AndroidJUnit" factoryName="Android JUnit">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <patterns />
+      <method>
+        <option name="Make" enabled="false" />
+        <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+      </method>
     </configuration>
-    <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
+    <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android App">
       <module name="" />
       <option name="DEPLOY" value="true" />
       <option name="ARTIFACT_NAME" value="" />
       <option name="PM_INSTALL_OPTIONS" value="" />
       <option name="ACTIVITY_EXTRA_FLAGS" value="" />
       <option name="MODE" value="default_activity" />
-      <option name="TARGET_SELECTION_MODE" value="EMULATOR" />
       <option name="PREFERRED_AVD" value="" />
       <option name="CLEAR_LOGCAT" value="false" />
-      <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
+      <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
       <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
       <option name="FORCE_STOP_RUNNING_APP" value="true" />
-      <option name="DEBUGGER_TYPE" value="Java" />
+      <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
       <option name="USE_LAST_SELECTED_DEVICE" value="false" />
       <option name="PREFERRED_AVD" value="" />
-      <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="0" />
-      <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
-      <Hybrid>
-        <option name="WORKING_DIR" value="" />
-        <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      </Hybrid>
-      <Native>
+      <option name="DEBUGGER_TYPE" value="Auto" />
+      <Auto>
+        <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+        <option name="SHOW_STATIC_VARS" value="true" />
         <option name="WORKING_DIR" value="" />
         <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      </Native>
-      <Java />
-      <Profilers>
-        <option name="GAPID_DISABLE_PCS" value="false" />
-      </Profilers>
-      <option name="DEEP_LINK" value="" />
-      <option name="ACTIVITY_CLASS" value="" />
-      <method />
-    </configuration>
-    <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
-      <module name="" />
-      <option name="TESTING_TYPE" value="0" />
-      <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
-      <option name="METHOD_NAME" value="" />
-      <option name="CLASS_NAME" value="" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="EXTRA_OPTIONS" value="" />
-      <option name="TARGET_SELECTION_MODE" value="EMULATOR" />
-      <option name="PREFERRED_AVD" value="" />
-      <option name="CLEAR_LOGCAT" value="false" />
-      <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
-      <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
-      <option name="FORCE_STOP_RUNNING_APP" value="true" />
-      <option name="DEBUGGER_TYPE" value="Java" />
-      <option name="USE_LAST_SELECTED_DEVICE" value="false" />
-      <option name="PREFERRED_AVD" value="" />
-      <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="0" />
-      <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
+        <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+      </Auto>
       <Hybrid>
+        <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+        <option name="SHOW_STATIC_VARS" value="true" />
         <option name="WORKING_DIR" value="" />
         <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+        <option name="SHOW_OPTIMIZED_WARNING" value="true" />
       </Hybrid>
+      <Java />
       <Native>
+        <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+        <option name="SHOW_STATIC_VARS" value="true" />
         <option name="WORKING_DIR" value="" />
         <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+        <option name="SHOW_OPTIMIZED_WARNING" value="true" />
       </Native>
-      <Java />
       <Profilers>
-        <option name="GAPID_DISABLE_PCS" value="false" />
+        <option name="ENABLE_ADVANCED_PROFILING" value="true" />
+        <option name="SUPPORT_LIB_ENABLED" value="true" />
+        <option name="INSTRUMENTATION_ENABLED" value="true" />
       </Profilers>
+      <option name="DEEP_LINK" value="" />
+      <option name="ACTIVITY_CLASS" value="" />
       <method />
     </configuration>
     <configuration default="true" type="Application" factoryName="Application">
@@ -2614,51 +3547,6 @@
       </ExternalSystemSettings>
       <method />
     </configuration>
-    <configuration default="true" type="JUnit" factoryName="JUnit">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method>
-        <option name="Make" enabled="false" />
-        <option name="Android.Gradle.BeforeRunTask" enabled="true" />
-      </method>
-    </configuration>
-    <configuration default="true" type="JUnitTestDiscovery" factoryName="JUnit Test Discovery" changeList="All">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
     <configuration default="true" type="JarApplication" factoryName="JAR Application">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <envs />
@@ -2744,14 +3632,72 @@
       <listeners />
       <method />
     </configuration>
-    <configuration default="false" name="TestApp" type="AndroidRunConfigurationType" factoryName="Android Application" activateToolWindowBeforeRun="false">
+    <configuration default="false" name="TestApp" type="AndroidRunConfigurationType" factoryName="Android App">
       <module name="TestApp" />
       <option name="DEPLOY" value="true" />
       <option name="ARTIFACT_NAME" value="" />
       <option name="PM_INSTALL_OPTIONS" value="" />
       <option name="ACTIVITY_EXTRA_FLAGS" value="" />
       <option name="MODE" value="default_activity" />
-      <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
+      <option name="PREFERRED_AVD" value="" />
+      <option name="CLEAR_LOGCAT" value="false" />
+      <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
+      <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
+      <option name="FORCE_STOP_RUNNING_APP" value="true" />
+      <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
+      <option name="USE_LAST_SELECTED_DEVICE" value="false" />
+      <option name="PREFERRED_AVD" value="" />
+      <option name="DEBUGGER_TYPE" value="Auto" />
+      <Auto>
+        <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+        <option name="SHOW_STATIC_VARS" value="true" />
+        <option name="WORKING_DIR" value="" />
+        <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+        <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+      </Auto>
+      <Hybrid>
+        <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+        <option name="SHOW_STATIC_VARS" value="true" />
+        <option name="WORKING_DIR" value="" />
+        <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+        <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+      </Hybrid>
+      <Java />
+      <Native>
+        <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+        <option name="SHOW_STATIC_VARS" value="true" />
+        <option name="WORKING_DIR" value="" />
+        <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+        <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+      </Native>
+      <Profilers>
+        <option name="ENABLE_ADVANCED_PROFILING" value="true" />
+        <option name="SUPPORT_LIB_ENABLED" value="true" />
+        <option name="INSTRUMENTATION_ENABLED" value="true" />
+      </Profilers>
+      <option name="DEEP_LINK" value="" />
+      <option name="ACTIVITY_CLASS" value="" />
+      <method />
+    </configuration>
+    <list size="3">
+      <item index="0" class="java.lang.String" itemvalue="Android App.TestApp" />
+      <item index="1" class="java.lang.String" itemvalue="Gradle.ATMobileAnalytics:Tracker [clean]" />
+      <item index="2" class="java.lang.String" itemvalue="Gradle.ATMobileAnalytics:Tracker [test]" />
+    </list>
+    <recent_temporary>
+      <list size="2">
+        <item index="0" class="java.lang.String" itemvalue="Gradle.ATMobileAnalytics:Tracker [test]" />
+        <item index="1" class="java.lang.String" itemvalue="Gradle.ATMobileAnalytics:Tracker [clean]" />
+      </list>
+    </recent_temporary>
+    <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
+      <module name="" />
+      <option name="DEPLOY" value="true" />
+      <option name="ARTIFACT_NAME" value="" />
+      <option name="PM_INSTALL_OPTIONS" value="" />
+      <option name="ACTIVITY_EXTRA_FLAGS" value="" />
+      <option name="MODE" value="default_activity" />
+      <option name="TARGET_SELECTION_MODE" value="EMULATOR" />
       <option name="PREFERRED_AVD" value="" />
       <option name="CLEAR_LOGCAT" value="false" />
       <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
@@ -2778,19 +3724,39 @@
       <option name="ACTIVITY_CLASS" value="" />
       <method />
     </configuration>
-    <list size="4">
-      <item index="0" class="java.lang.String" itemvalue="Android Application.TestApp" />
-      <item index="1" class="java.lang.String" itemvalue="Gradle.ATMobileAnalytics:Tracker [clean]" />
-      <item index="2" class="java.lang.String" itemvalue="Gradle.ATMobileAnalytics:Tracker [test]" />
-      <item index="3" class="java.lang.String" itemvalue="Android Tests.setConfigTest()" />
-    </list>
-    <recent_temporary>
-      <list size="3">
-        <item index="0" class="java.lang.String" itemvalue="Gradle.ATMobileAnalytics:Tracker [test]" />
-        <item index="1" class="java.lang.String" itemvalue="Gradle.ATMobileAnalytics:Tracker [clean]" />
-        <item index="2" class="java.lang.String" itemvalue="Android Tests.setConfigTest()" />
-      </list>
-    </recent_temporary>
+    <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
+      <module name="" />
+      <option name="TESTING_TYPE" value="0" />
+      <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
+      <option name="METHOD_NAME" value="" />
+      <option name="CLASS_NAME" value="" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="EXTRA_OPTIONS" value="" />
+      <option name="TARGET_SELECTION_MODE" value="EMULATOR" />
+      <option name="PREFERRED_AVD" value="" />
+      <option name="CLEAR_LOGCAT" value="false" />
+      <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
+      <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
+      <option name="FORCE_STOP_RUNNING_APP" value="true" />
+      <option name="DEBUGGER_TYPE" value="Java" />
+      <option name="USE_LAST_SELECTED_DEVICE" value="false" />
+      <option name="PREFERRED_AVD" value="" />
+      <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="0" />
+      <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
+      <Hybrid>
+        <option name="WORKING_DIR" value="" />
+        <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+      </Hybrid>
+      <Native>
+        <option name="WORKING_DIR" value="" />
+        <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+      </Native>
+      <Java />
+      <Profilers>
+        <option name="GAPID_DISABLE_PCS" value="false" />
+      </Profilers>
+      <method />
+    </configuration>
     <configuration name="&lt;template&gt;" type="Applet" default="true" selected="false">
       <option name="MAIN_CLASS_NAME" />
       <option name="HTML_FILE_NAME" />
@@ -2803,8 +3769,77 @@
     <configuration name="&lt;template&gt;" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" default="true" selected="false">
       <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
     </configuration>
+    <configuration default="false" name="setConfigTest()" type="AndroidTestRunConfigurationType" factoryName="Android Tests" temporary="true" nameIsGenerated="true">
+      <module name="Tracker" />
+      <option name="TESTING_TYPE" value="3" />
+      <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
+      <option name="METHOD_NAME" value="setConfigTest" />
+      <option name="CLASS_NAME" value="com.atinternet.tracker.TrackerTest" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="EXTRA_OPTIONS" value="" />
+      <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
+      <option name="PREFERRED_AVD" value="" />
+      <option name="CLEAR_LOGCAT" value="false" />
+      <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
+      <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
+      <option name="FORCE_STOP_RUNNING_APP" value="true" />
+      <option name="DEBUGGER_TYPE" value="Java" />
+      <option name="USE_LAST_SELECTED_DEVICE" value="false" />
+      <option name="PREFERRED_AVD" value="" />
+      <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="0" />
+      <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
+      <Hybrid>
+        <option name="WORKING_DIR" value="" />
+        <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+      </Hybrid>
+      <Native>
+        <option name="WORKING_DIR" value="" />
+        <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+      </Native>
+      <Java />
+      <Profilers>
+        <option name="GAPID_DISABLE_PCS" value="false" />
+      </Profilers>
+      <method />
+    </configuration>
+    <configuration default="false" name="TestApp" type="AndroidRunConfigurationType" factoryName="Android Application" activateToolWindowBeforeRun="false">
+      <module name="TestApp" />
+      <option name="DEPLOY" value="true" />
+      <option name="ARTIFACT_NAME" value="" />
+      <option name="PM_INSTALL_OPTIONS" value="" />
+      <option name="ACTIVITY_EXTRA_FLAGS" value="" />
+      <option name="MODE" value="default_activity" />
+      <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
+      <option name="PREFERRED_AVD" value="" />
+      <option name="CLEAR_LOGCAT" value="false" />
+      <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
+      <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
+      <option name="FORCE_STOP_RUNNING_APP" value="true" />
+      <option name="DEBUGGER_TYPE" value="Java" />
+      <option name="USE_LAST_SELECTED_DEVICE" value="false" />
+      <option name="PREFERRED_AVD" value="" />
+      <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="0" />
+      <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
+      <Hybrid>
+        <option name="WORKING_DIR" value="" />
+        <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+      </Hybrid>
+      <Native>
+        <option name="WORKING_DIR" value="" />
+        <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+      </Native>
+      <Java />
+      <Profilers>
+        <option name="GAPID_DISABLE_PCS" value="false" />
+      </Profilers>
+      <option name="DEEP_LINK" value="" />
+      <option name="ACTIVITY_CLASS" value="" />
+      <method />
+    </configuration>
+  </component>
+  <component name="ShelveChangesManager" show_recycled="false">
+    <option name="remove_strategy" value="false" />
   </component>
-  <component name="ShelveChangesManager" show_recycled="false" />
   <component name="SvnConfiguration">
     <configuration />
   </component>
@@ -2813,6 +3848,7 @@
       <changelist id="5fd7fdf2-db46-4622-95d9-7515ac863253" name="Default" comment="" />
       <created>1444228463921</created>
       <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
       <updated>1444228463921</updated>
     </task>
     <servers />
@@ -2850,40 +3886,60 @@
     </history-entry>
   </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="23" width="1280" height="720" extended-state="6" />
-    <editor active="true" />
+    <frame x="0" y="22" width="1680" height="970" extended-state="0" />
+    <editor active="false" />
     <layout>
-      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Android Model" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3290398" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3294702" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.48013246" sideWeight="0.503231" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Android Monitor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.35099337" sideWeight="0.49676898" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.38992974" sideWeight="0.49676898" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3290398" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39900663" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.48013246" sideWeight="0.503231" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Gradle Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3294702" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3294702" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25091577" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32956383" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25121164" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.39072847" sideWeight="0.49676898" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Android Model" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
+      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39900663" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3294702" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State>
+              <option name="RECENTLY_FILTERED_USER_GROUPS">
+                <collection />
+              </option>
+              <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
+                <collection />
+              </option>
+            </State>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
   <component name="Vcs.Log.UiProperties">
     <option name="RECENTLY_FILTERED_USER_GROUPS">
       <collection />
@@ -2900,13 +3956,13 @@
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/Tracker.java</url>
-          <line>560</line>
+          <line>640</line>
           <properties />
           <option name="timeStamp" value="55" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/Tracker.java</url>
-          <line>557</line>
+          <line>636</line>
           <properties />
           <option name="timeStamp" value="56" />
         </line-breakpoint>
@@ -2918,144 +3974,118 @@
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/TestApp/src/main/java/com/atinternet/FirstScreenActivity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
+        <state relative-caret-position="0">
           <caret line="16" column="0" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/TVTrackingPlugin.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
+        <state relative-caret-position="0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="method#stringifyTvTResponse#0;class#TVTrackingPlugin#0" expanded="false" />
-            <element signature="method#getTvTrackingResponse#0;class#TVTrackingPlugin#0" expanded="false" />
-            <element signature="method#setDirectCampaignToRemanent#0;class#TVTrackingPlugin#0" expanded="false" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/TestApp/src/main/java/com/atinternet/FirstScreenActivity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
+        <state relative-caret-position="0">
           <caret line="16" column="0" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/TVTrackingPlugin.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
+        <state relative-caret-position="0">
           <caret line="263" column="5" selection-start-line="263" selection-start-column="5" selection-end-line="263" selection-end-column="5" />
-          <folding>
-            <element signature="method#stringifyTvTResponse#0;class#TVTrackingPlugin#0" expanded="false" />
-            <element signature="method#getTvTrackingResponse#0;class#TVTrackingPlugin#0" expanded="false" />
-            <element signature="method#setDirectCampaignToRemanent#0;class#TVTrackingPlugin#0" expanded="false" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/TestApp/src/main/java/com/atinternet/FirstScreenActivity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
+        <state relative-caret-position="0">
           <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/TVTrackingPlugin.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
+        <state relative-caret-position="0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="method#stringifyTvTResponse#0;class#TVTrackingPlugin#0" expanded="false" />
-            <element signature="method#getTvTrackingResponse#0;class#TVTrackingPlugin#0" expanded="false" />
-            <element signature="method#setDirectCampaignToRemanent#0;class#TVTrackingPlugin#0" expanded="false" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/TestApp/src/main/java/com/atinternet/FirstScreenActivity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
+        <state relative-caret-position="0">
           <caret line="20" column="51" selection-start-line="20" selection-start-column="51" selection-end-line="20" selection-end-column="51" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/TVTrackingPlugin.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
+        <state relative-caret-position="0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="method#stringifyTvTResponse#0;class#TVTrackingPlugin#0" expanded="false" />
-            <element signature="method#getTvTrackingResponse#0;class#TVTrackingPlugin#0" expanded="false" />
-            <element signature="method#setDirectCampaignToRemanent#0;class#TVTrackingPlugin#0" expanded="false" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/TestApp/src/main/java/com/atinternet/FirstScreenActivity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
+        <state relative-caret-position="0">
           <caret line="20" column="51" selection-start-line="20" selection-start-column="51" selection-end-line="20" selection-end-column="51" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/Tracker/build.gradle">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
+        <state relative-caret-position="0">
           <caret line="38" column="9" selection-start-line="38" selection-start-column="9" selection-end-line="38" selection-end-column="9" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/TestApp/src/main/java/com/atinternet/FirstScreenActivity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
+        <state relative-caret-position="0">
           <caret line="25" column="43" selection-start-line="25" selection-start-column="43" selection-end-line="25" selection-end-column="43" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/TechnicalContext.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
+        <state relative-caret-position="0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/BufferTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="2.9045093">
-          <caret line="111" column="23" selection-start-line="111" selection-start-column="23" selection-end-line="111" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/BufferTest.java" />
     <entry file="file://$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/ReferrerReceiver.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.49479166">
+        <state relative-caret-position="0">
           <caret line="41" column="39" selection-start-line="41" selection-start-column="39" selection-end-line="41" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/TVTrackingPlugin.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3454861">
+        <state relative-caret-position="0">
           <caret line="283" column="56" selection-start-line="283" selection-start-column="56" selection-end-line="283" selection-end-column="56" />
-          <folding>
-            <element signature="method#stringifyTvTResponse#0;class#TVTrackingPlugin#0" expanded="false" />
-            <element signature="method#getTvTrackingResponse#0;class#TVTrackingPlugin#0" expanded="false" />
-            <element signature="method#setDirectCampaignToRemanent#0;class#TVTrackingPlugin#0" expanded="false" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$USER_HOME$/Library/Android/sdk/sources/android-23/android/content/Context.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33260393">
+        <state relative-caret-position="0">
           <caret line="324" column="36" selection-start-line="324" selection-start-column="36" selection-end-line="324" selection-end-column="36" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/Builder.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.48951048">
+        <state relative-caret-position="0">
           <caret line="54" column="67" selection-start-line="54" selection-start-column="67" selection-end-line="54" selection-end-column="67" />
           <folding />
         </state>
@@ -3063,7 +4093,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/Buffer.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.055944055">
+        <state relative-caret-position="0">
           <caret line="133" column="72" selection-start-line="133" selection-start-column="72" selection-end-line="133" selection-end-column="72" />
           <folding />
         </state>
@@ -3071,27 +4101,16 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/TrackerActivityLifeCyle.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.034965035">
+        <state relative-caret-position="0">
           <caret line="57" column="40" selection-start-line="57" selection-start-column="40" selection-end-line="57" selection-end-column="40" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/LifeCycleTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="108" column="56" selection-start-line="108" selection-start-column="56" selection-end-line="108" selection-end-column="56" />
-          <folding>
-            <element signature="method#setUp#0;class#LifeCycleTest#0" expanded="false" />
-            <element signature="method#retrieveSDKV1LifecycleTest#0;class#LifeCycleTest#0" expanded="false" />
-            <element signature="method#firstLaunchInitTest#0;class#LifeCycleTest#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/LifeCycleTest.java" />
     <entry file="file://$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/LifeCycle.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
+        <state relative-caret-position="0">
           <caret line="180" column="62" selection-start-line="180" selection-start-column="62" selection-end-line="180" selection-end-column="62" />
           <folding />
         </state>
@@ -3099,35 +4118,23 @@
     </entry>
     <entry file="file://$USER_HOME$/Library/Android/sdk/sources/android-23/org/json/JSONObject.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3313433">
+        <state relative-caret-position="0">
           <caret line="607" column="22" selection-start-line="607" selection-start-column="22" selection-end-line="607" selection-end-column="22" />
-          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/Tool.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.397878">
+        <state relative-caret-position="0">
           <caret line="195" column="11" selection-start-line="195" selection-start-column="11" selection-end-line="195" selection-end-column="11" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/ToolTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.9104478">
-          <caret line="49" column="21" selection-start-line="49" selection-start-column="21" selection-end-line="49" selection-end-column="21" />
-          <folding>
-            <element signature="imports" expanded="false" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/ToolTest.java" />
     <entry file="file://$PROJECT_DIR$/TestApp/build.gradle">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3857143">
+        <state relative-caret-position="0">
           <caret line="9" column="27" selection-start-line="9" selection-start-column="27" selection-end-line="9" selection-end-column="27" />
           <folding />
         </state>
@@ -3135,15 +4142,14 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/build.gradle">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-6.111111">
+        <state relative-caret-position="0">
           <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/Sender.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="2.7864583">
+        <state relative-caret-position="0">
           <caret line="138" column="22" selection-start-line="138" selection-start-column="22" selection-end-line="138" selection-end-column="22" />
           <folding />
         </state>
@@ -3151,15 +4157,14 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Tracker/build.gradle">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
+        <state relative-caret-position="0">
           <caret line="63" column="44" selection-start-line="63" selection-start-column="44" selection-end-line="63" selection-end-column="44" />
-          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/TrackerKeys.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
+        <state relative-caret-position="0">
           <caret line="174" column="47" selection-start-line="174" selection-start-column="47" selection-end-line="174" selection-end-column="47" />
           <folding />
         </state>
@@ -3167,177 +4172,40 @@
     </entry>
     <entry file="file://$USER_HOME$/Library/Android/sdk/sources/android-23/java/lang/Enum.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.0477612">
+        <state relative-caret-position="0">
           <caret line="99" column="18" selection-start-line="99" selection-start-column="18" selection-end-line="99" selection-end-column="18" />
-          <folding>
-            <element signature="e#3658#3659#0" expanded="false" />
-            <element signature="e#3685#3686#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/TechnicalContextTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="79" column="25" selection-start-line="79" selection-start-column="22" selection-end-line="79" selection-end-column="25" />
-          <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/TechnicalContextTest.java" />
     <entry file="file://$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/TechnicalContext.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
+        <state relative-caret-position="0">
           <caret line="292" column="36" selection-start-line="292" selection-start-column="19" selection-end-line="292" selection-end-column="36" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/BuilderTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3183024">
-          <caret line="74" column="0" selection-start-line="74" selection-start-column="0" selection-end-line="74" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/TrackerTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="91" column="43" selection-start-line="91" selection-start-column="43" selection-end-line="91" selection-end-column="43" />
-          <folding>
-            <element signature="e#2125#2149#0" expanded="false" />
-            <element signature="method#setUp#0;class#TrackerTest#0" expanded="false" />
-            <element signature="method#initTrackerTest#0;class#TrackerTest#0" expanded="false" />
-            <element signature="class#2760:2923" expanded="false" />
-            <element signature="initializer##0;class#2760:2923" expanded="false" />
-            <element signature="method#setListenerTest#0;class#TrackerTest#0" expanded="false" />
-            <element signature="class#4848:5584" expanded="false" />
-            <element signature="method#trackerNeedsFirstLaunchApproval#0;class#4848:5584" expanded="false" />
-            <element signature="method#buildDidEnd#0;class#4848:5584" expanded="false" />
-            <element signature="method#sendDidEnd#0;class#4848:5584" expanded="false" />
-            <element signature="method#didCallPartner#0;class#4848:5584" expanded="false" />
-            <element signature="method#warningDidOccur#0;class#4848:5584" expanded="false" />
-            <element signature="method#saveDidEnd#0;class#4848:5584" expanded="false" />
-            <element signature="method#errorDidOccur#0;class#4848:5584" expanded="false" />
-            <element signature="method#getEventPluginTest#0;class#TrackerTest#0" expanded="false" />
-            <element signature="method#getOfflinePluginTest#0;class#TrackerTest#0" expanded="false" />
-            <element signature="method#getGesturesPluginTest#0;class#TrackerTest#0" expanded="false" />
-            <element signature="method#getContextPluginTest#0;class#TrackerTest#0" expanded="false" />
-            <element signature="method#getIdentifiedVisitorPluginTest#0;class#TrackerTest#0" expanded="false" />
-            <element signature="method#getCustomObjectsPluginTest#0;class#TrackerTest#0" expanded="false" />
-            <element signature="method#getPublishersPluginTest#0;class#TrackerTest#0" expanded="false" />
-            <element signature="method#getSelfPromotionsPluginTest#0;class#TrackerTest#0" expanded="false" />
-            <element signature="method#getCustomVarsPluginTest#0;class#TrackerTest#0" expanded="false" />
-            <element signature="method#getOrdersPluginTest#0;class#TrackerTest#0" expanded="false" />
-            <element signature="method#getCartPluginTest#0;class#TrackerTest#0" expanded="false" />
-            <element signature="method#getAislesPluginTest#0;class#TrackerTest#0" expanded="false" />
-            <element signature="method#getCampaignsPluginTest#0;class#TrackerTest#0" expanded="false" />
-            <element signature="method#getGPSPluginTest#0;class#TrackerTest#0" expanded="false" />
-            <element signature="method#getTVTrackingPluginTest#0;class#TrackerTest#0" expanded="false" />
-            <element signature="method#getNuggAdsPluginTest#0;class#TrackerTest#0" expanded="false" />
-            <element signature="method#getInternalSearchesPluginTest#0;class#TrackerTest#0" expanded="false" />
-            <element signature="method#getDynamicLabelsPluginTest#0;class#TrackerTest#0" expanded="false" />
-            <element signature="method#getCustomTreeStructurePluginTest#0;class#TrackerTest#0" expanded="false" />
-            <element signature="method#getProductsPluginTest#0;class#TrackerTest#0" expanded="false" />
-            <element signature="method#getPlayersPluginTest#0;class#TrackerTest#0" expanded="false" />
-            <element signature="method#setParamBooleanTest#0;class#TrackerTest#0" expanded="false" />
-            <element signature="method#setParamFloatTest#0;class#TrackerTest#0" expanded="false" />
-            <element signature="method#setParamDoubleTest#0;class#TrackerTest#0" expanded="false" />
-            <element signature="method#setParamStringTest#0;class#TrackerTest#0" expanded="false" />
-            <element signature="method#setParamArrayTest#0;class#TrackerTest#0" expanded="false" />
-            <element signature="class#11834:11928" expanded="false" />
-            <element signature="initializer##0;class#11834:11928" expanded="false" />
-            <element signature="method#setParamTabTest#0;class#TrackerTest#0" expanded="false" />
-            <element signature="method#setParamMapTest#0;class#TrackerTest#0" expanded="false" />
-            <element signature="class#12374:12485" expanded="false" />
-            <element signature="initializer##0;class#12374:12485" expanded="false" />
-            <element signature="method#setParamClosureTest#0;class#TrackerTest#0" expanded="false" />
-            <element signature="method#setParamIntWithOptions#0;class#TrackerTest#0" expanded="false" />
-            <element signature="method#setParamBooleanWithOptions#0;class#TrackerTest#0" expanded="false" />
-            <element signature="method#setParamFloatWithOptions#0;class#TrackerTest#0" expanded="false" />
-            <element signature="method#setParamDoubleWithOptions#0;class#TrackerTest#0" expanded="false" />
-            <element signature="method#setParamStringWithOptions#0;class#TrackerTest#0" expanded="false" />
-            <element signature="method#setParamArrayWithOptionsTest#0;class#TrackerTest#0" expanded="false" />
-            <element signature="class#15203:15297" expanded="false" />
-            <element signature="initializer##0;class#15203:15297" expanded="false" />
-            <element signature="method#setParamTabWithOptionsTest#0;class#TrackerTest#0" expanded="false" />
-            <element signature="method#setParamMapWithOptionsTest#0;class#TrackerTest#0" expanded="false" />
-            <element signature="class#16007:16124" expanded="false" />
-            <element signature="initializer##0;class#16007:16124" expanded="false" />
-            <element signature="method#setParamClosureWithOptionsTest#0;class#TrackerTest#0" expanded="false" />
-            <element signature="method#doNotTrackTest#0;class#TrackerTest#0" expanded="false" />
-            <element signature="method#emptyParameterTest#0;class#TrackerTest#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/ConfigurationTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="55" column="22" selection-start-line="55" selection-start-column="22" selection-end-line="55" selection-end-column="22" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/PluginParamTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.51724136">
-          <caret line="42" column="48" selection-start-line="42" selection-start-column="48" selection-end-line="42" selection-end-column="48" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/NuggAdTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6366048">
-          <caret line="46" column="44" selection-start-line="46" selection-start-column="44" selection-end-line="46" selection-end-column="44" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/StorageTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33421752">
-          <caret line="136" column="69" selection-start-line="136" selection-start-column="69" selection-end-line="136" selection-end-column="69" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/AbstractTestClass.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="38" column="28" selection-start-line="38" selection-start-column="28" selection-end-line="38" selection-end-column="28" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/BuilderTest.java" />
+    <entry file="file://$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/TrackerTest.java" />
+    <entry file="file://$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/ConfigurationTest.java" />
+    <entry file="file://$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/PluginParamTest.java" />
+    <entry file="file://$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/NuggAdTest.java" />
+    <entry file="file://$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/StorageTest.java" />
+    <entry file="file://$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/AbstractTestClass.java" />
     <entry file="file://$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/Dispatcher.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-4.851852">
+        <state relative-caret-position="0">
           <caret line="153" column="53" selection-start-line="153" selection-start-column="24" selection-end-line="153" selection-end-column="53" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/TVTrackingTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="45" column="70" selection-start-line="43" selection-start-column="8" selection-end-line="45" selection-end-column="70" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/IdentifiedVisitorTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="44" column="71" selection-start-line="44" selection-start-column="71" selection-end-line="44" selection-end-column="71" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/TVTrackingTest.java" />
+    <entry file="file://$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/IdentifiedVisitorTest.java" />
     <entry file="file://$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/TVTracking.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
+        <state relative-caret-position="0">
           <caret line="72" column="25" selection-start-line="72" selection-start-column="25" selection-end-line="72" selection-end-column="25" />
           <folding />
         </state>
@@ -3345,7 +4213,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/Storage.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.14705883">
+        <state relative-caret-position="0">
           <caret line="189" column="16" selection-start-line="189" selection-start-column="16" selection-end-line="189" selection-end-column="16" />
           <folding />
         </state>
@@ -3353,7 +4221,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/Configuration.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.81764704">
+        <state relative-caret-position="0">
           <caret line="115" column="54" selection-start-line="115" selection-start-column="30" selection-end-line="115" selection-end-column="54" />
           <folding />
         </state>
@@ -3361,7 +4229,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/IdentifiedVisitor.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
+        <state relative-caret-position="0">
           <caret line="142" column="53" selection-start-line="142" selection-start-column="53" selection-end-line="142" selection-end-column="53" />
           <folding />
         </state>
@@ -3369,49 +4237,74 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/TrackerQueue.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
+        <state relative-caret-position="1065">
           <caret line="96" column="0" selection-start-line="96" selection-start-column="0" selection-end-line="96" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/SetConfigCallbackTest.java">
+    <entry file="file://$PROJECT_DIR$/Tracker/src/androidTest/java/com/atinternet/tracker/SetConfigCallbackTest.java" />
+    <entry file="file://$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/SetConfigCallback.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="38" column="61" selection-start-line="38" selection-start-column="61" selection-end-line="38" selection-end-column="61" />
+        <state relative-caret-position="105">
+          <caret line="31" column="22" selection-start-line="31" selection-start-column="22" selection-end-line="31" selection-end-column="22" />
           <folding>
-            <element signature="e#1836#1837#0" expanded="true" />
+            <element signature="e#0#1468#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/SetConfigCallback.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="28" column="22" selection-start-line="28" selection-start-column="22" selection-end-line="28" selection-end-column="22" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/TestApp/src/main/java/com/atinternet/FirstScreenActivity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
+        <state relative-caret-position="615">
           <caret line="55" column="13" selection-start-line="55" selection-start-column="13" selection-end-line="55" selection-end-column="13" />
-          <folding>
-            <element signature="e#795#995#0" expanded="true" />
-            <element signature="e#994#995#0" expanded="true" />
-            <element signature="e#1632#1831#0" expanded="true" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/Tracker/src/main/java/com/atinternet/tracker/Tracker.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.0205883">
-          <caret line="709" column="55" selection-start-line="709" selection-start-column="55" selection-end-line="709" selection-end-column="55" />
+        <state relative-caret-position="120">
+          <caret line="692" column="51" selection-start-line="692" selection-start-column="51" selection-end-line="692" selection-end-column="51" />
           <folding>
-            <element signature="e#20115#20680#0" expanded="true" />
-            <element signature="e#20679#20680#0" expanded="true" />
+            <element signature="e#3863#3864#0" expanded="true" />
+            <element signature="e#3892#3893#0" expanded="true" />
+            <element signature="e#3927#3928#0" expanded="true" />
+            <element signature="e#3957#3958#0" expanded="true" />
+            <element signature="e#4023#4024#0" expanded="true" />
+            <element signature="e#4061#4062#0" expanded="true" />
+            <element signature="e#4095#4096#0" expanded="true" />
+            <element signature="e#4128#4129#0" expanded="true" />
+            <element signature="e#4182#4183#0" expanded="true" />
+            <element signature="e#4221#4222#0" expanded="true" />
+            <element signature="e#4440#4441#0" expanded="true" />
+            <element signature="e#4477#4478#0" expanded="true" />
+            <element signature="e#4530#4531#0" expanded="true" />
+            <element signature="e#4582#4583#0" expanded="true" />
+            <element signature="e#8482#8483#0" expanded="true" />
+            <element signature="e#8532#8533#0" expanded="true" />
+            <element signature="e#10918#10919#0" expanded="true" />
+            <element signature="e#10954#10955#0" expanded="true" />
+            <element signature="e#11105#11106#0" expanded="true" />
+            <element signature="e#11136#11137#0" expanded="true" />
+            <element signature="e#12786#12787#0" expanded="true" />
+            <element signature="e#12866#12867#0" expanded="true" />
+            <element signature="e#13160#13161#0" expanded="true" />
+            <element signature="e#13232#13233#0" expanded="true" />
+            <element signature="e#13347#13348#0" expanded="true" />
+            <element signature="e#13427#13428#0" expanded="true" />
+            <element signature="e#13542#13543#0" expanded="true" />
+            <element signature="e#13622#13623#0" expanded="true" />
+            <element signature="e#13954#13955#0" expanded="true" />
+            <element signature="e#14034#14035#0" expanded="true" />
+            <element signature="e#15579#15580#0" expanded="true" />
+            <element signature="e#15647#15648#0" expanded="true" />
+            <element signature="e#16742#16743#0" expanded="true" />
+            <element signature="e#16818#16819#0" expanded="true" />
+            <element signature="e#17950#17951#0" expanded="true" />
+            <element signature="e#18026#18027#0" expanded="true" />
+            <element signature="e#39383#39384#0" expanded="true" />
+            <element signature="e#39469#39470#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/ATMobileAnalytics/TestApp/.gitignore b/ATMobileAnalytics/TestApp/.gitignore
deleted file mode 100644
index 796b96d1..00000000
--- a/ATMobileAnalytics/TestApp/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/ATMobileAnalytics/TestApp/TestApp.iml b/ATMobileAnalytics/TestApp/TestApp.iml
index 4c20ac60..f01d7399 100644
--- a/ATMobileAnalytics/TestApp/TestApp.iml
+++ b/ATMobileAnalytics/TestApp/TestApp.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":TestApp" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="ATMobileAnalytics" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":TestApp" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -9,7 +9,6 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <afterSyncTasks>
@@ -26,63 +25,77 @@
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
     <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
-    <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="play-services-basement-8.4.0" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-22.2.1" level="project" />
-    <orderEntry type="library" exported="" name="play-services-ads-8.4.0" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-23.0.0" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-23.0.0" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-25.0.0" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-25.0.0" level="project" />
+    <orderEntry type="library" exported="" name="support-media-compat-25.0.0" level="project" />
+    <orderEntry type="library" exported="" name="support-compat-25.0.0" level="project" />
+    <orderEntry type="library" exported="" name="support-fragment-25.0.0" level="project" />
+    <orderEntry type="library" exported="" name="animated-vector-drawable-25.0.0" level="project" />
+    <orderEntry type="library" exported="" name="support-core-ui-25.0.0" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-25.0.0" level="project" />
+    <orderEntry type="library" exported="" name="support-vector-drawable-25.0.0" level="project" />
+    <orderEntry type="library" exported="" name="support-core-utils-25.0.0" level="project" />
+    <orderEntry type="library" exported="" name="gson-2.7" level="project" />
     <orderEntry type="module" module-name="Tracker" exported="" />
   </component>
 </module>
\ No newline at end of file
diff --git a/ATMobileAnalytics/TestApp/build.gradle b/ATMobileAnalytics/TestApp/build.gradle
old mode 100644
new mode 100755
index a94a2585..42e278a0
--- a/ATMobileAnalytics/TestApp/build.gradle
+++ b/ATMobileAnalytics/TestApp/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "24.0.3"
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         applicationId "com.atinternet"
@@ -11,6 +11,10 @@ android {
         versionCode 1
         versionName "1.0"
     }
+    lintOptions {
+        checkReleaseBuilds false
+        abortOnError false
+    }
     buildTypes {
         release {
             minifyEnabled false
@@ -28,7 +32,6 @@ repositories {
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     compile 'com.android.support:appcompat-v7:25.0.0'
-    compile 'com.google.android.gms:play-services-ads:9.6.1'
     compile 'com.google.code.gson:gson:2.7'
     compile project(':Tracker')
 }
diff --git a/ATMobileAnalytics/TestApp/libs/ATInternet.jar b/ATMobileAnalytics/TestApp/libs/ATInternet.jar
deleted file mode 100644
index 8649f416..00000000
Binary files a/ATMobileAnalytics/TestApp/libs/ATInternet.jar and /dev/null differ
diff --git a/ATMobileAnalytics/TestApp/proguard-rules.pro b/ATMobileAnalytics/TestApp/proguard-rules.pro
old mode 100644
new mode 100755
diff --git a/ATMobileAnalytics/TestApp/src/androidTest/java/com/atinternet/ApplicationTest.java b/ATMobileAnalytics/TestApp/src/androidTest/java/com/atinternet/ApplicationTest.java
deleted file mode 100644
index 91e3e658..00000000
--- a/ATMobileAnalytics/TestApp/src/androidTest/java/com/atinternet/ApplicationTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.atinternet;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}
\ No newline at end of file
diff --git a/ATMobileAnalytics/TestApp/src/main/AndroidManifest.xml b/ATMobileAnalytics/TestApp/src/main/AndroidManifest.xml
old mode 100644
new mode 100755
index f416ce5d..6f49b1a8
--- a/ATMobileAnalytics/TestApp/src/main/AndroidManifest.xml
+++ b/ATMobileAnalytics/TestApp/src/main/AndroidManifest.xml
@@ -7,7 +7,6 @@
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 
     <application
-        android:name="com.atinternet.tracker.ATInternet"
         android:allowBackup="true"
         android:icon="@drawable/atinternet_logo"
         android:label="@string/app_name"
diff --git a/ATMobileAnalytics/TestApp/src/main/java/com/atinternet/FirstScreenActivity.java b/ATMobileAnalytics/TestApp/src/main/java/com/atinternet/FirstScreenActivity.java
deleted file mode 100644
index 1b61647e..00000000
--- a/ATMobileAnalytics/TestApp/src/main/java/com/atinternet/FirstScreenActivity.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.atinternet;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-import android.widget.ScrollView;
-
-import com.atinternet.tracker.SetConfigCallback;
-import com.atinternet.tracker.Tracker;
-import com.atinternet.tracker.TrackerConfigurationKeys;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-
-public class FirstScreenActivity extends Activity implements View.OnClickListener {
-
-    ScrollView mainView;
-    Button sendHit;
-    Button changeSite;
-    Button changeOfflineMode;
-    Button changeId;
-    Button changeHash;
-    Button changeCrashDetection;
-    Button changeSessionBGDuration;
-
-    Tracker tracker;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        tracker = new Tracker(this);
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.main_layout);
-        tracker.setListener(tracker.createDefaultTrackerListener());
-        mainView = (ScrollView) findViewById(R.id.scrollView);
-        tracker.setConfig(new HashMap<String, Object>() {{
-            put(TrackerConfigurationKeys.LOG, "logp");
-            put(TrackerConfigurationKeys.LOG_SSL, "logs");
-            put(TrackerConfigurationKeys.SITE, "552987");
-        }}, false, new SetConfigCallback() {
-            @Override
-            public void setConfigEnd() {
-                mainView.setVisibility(View.VISIBLE);
-            }
-        });
-        sendHit = (Button) findViewById(R.id.sendHit);
-        changeSite = (Button) findViewById(R.id.changeSite);
-        changeOfflineMode = (Button) findViewById(R.id.changeOfflineMode);
-        changeId = (Button) findViewById(R.id.changeId);
-        changeHash = (Button) findViewById(R.id.changeHash);
-        changeCrashDetection = (Button) findViewById(R.id.changeCrashDetection);
-        changeSessionBGDuration = (Button) findViewById(R.id.changeSessionBGDuration);
-
-        sendHit.setOnClickListener(FirstScreenActivity.this);
-        changeSite.setOnClickListener(FirstScreenActivity.this);
-        changeOfflineMode.setOnClickListener(FirstScreenActivity.this);
-        changeId.setOnClickListener(FirstScreenActivity.this);
-        changeHash.setOnClickListener(FirstScreenActivity.this);
-        changeCrashDetection.setOnClickListener(FirstScreenActivity.this);
-        changeSessionBGDuration.setOnClickListener(FirstScreenActivity.this);
-    }
-
-    @Override
-    public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.sendHit:
-                tracker.Screens().add("TestWithClick").sendView();
-                break;
-            case R.id.changeSite:
-                tracker.setSiteId(486136, new SetConfigCallback() {
-                    @Override
-                    public void setConfigEnd() {
-                        tracker.Screens().add("New site id").sendView();
-                        tracker.setSiteId(552987, new SetConfigCallback() {
-                            @Override
-                            public void setConfigEnd() {
-                                tracker.Screens().add("New site id").sendView();
-                            }
-                        });
-                    }
-                });
-                break;
-            case R.id.changeOfflineMode:
-                tracker.setOfflineMode(Tracker.OfflineMode.always, new SetConfigCallback() {
-                    @Override
-                    public void setConfigEnd() {
-                        tracker.Screens().add("Mode Always").sendView();
-                        tracker.setOfflineMode(Tracker.OfflineMode.required, new SetConfigCallback() {
-                            @Override
-                            public void setConfigEnd() {
-                                tracker.Screens().add("Mode Required").sendView();
-                            }
-                        });
-                    }
-                });
-                break;
-            case R.id.changeId:
-                tracker.setIdentifierType(Tracker.IdentifierType.advertisingId, new SetConfigCallback() {
-                    @Override
-                    public void setConfigEnd() {
-                        tracker.Screens().add("AdvertisingId").sendView();
-                        tracker.setIdentifierType(Tracker.IdentifierType.androidId, new SetConfigCallback() {
-                            @Override
-                            public void setConfigEnd() {
-                                tracker.Screens().add("AndroidId").sendView();
-
-                            }
-                        });
-                    }
-                });
-                break;
-            case R.id.changeHash:
-                tracker.setHashUserIdEnabled(true, new SetConfigCallback() {
-                    @Override
-                    public void setConfigEnd() {
-                        tracker.Screens().add("hash user id enable").sendView();
-                    }
-                });
-                break;
-            case R.id.changeCrashDetection:
-                tracker.setCrashDetectionEnabled(false, new SetConfigCallback() {
-                    @Override
-                    public void setConfigEnd() {
-                        // WARNING : THiS CODE CRASH
-                        FirstScreenActivity.this.runOnUiThread(new Runnable() {
-                            @Override
-                            public void run() {
-                                ArrayList e = null;
-                                e.get(0);
-                            }
-                        });
-                    }
-                });
-                break;
-            case R.id.changeSessionBGDuration:
-                tracker.setSessionBackgroundDuration(5, new SetConfigCallback() {
-                    @Override
-                    public void setConfigEnd() {
-                        tracker.Screens().add("new session duration").sendView();
-                    }
-                });
-                break;
-            case R.id.goToSecondScreenId:
-                startActivity(new Intent(FirstScreenActivity.this, SecondScreenActivity.class));
-                break;
-            default:
-                break;
-        }
-    }
-}
diff --git a/ATMobileAnalytics/TestApp/src/main/java/com/atinternet/Integration.java b/ATMobileAnalytics/TestApp/src/main/java/com/atinternet/Integration.java
old mode 100644
new mode 100755
diff --git a/ATMobileAnalytics/TestApp/src/main/java/com/atinternet/MainActivity.java b/ATMobileAnalytics/TestApp/src/main/java/com/atinternet/MainActivity.java
old mode 100644
new mode 100755
index 2e4eeb33..6b3357d3
--- a/ATMobileAnalytics/TestApp/src/main/java/com/atinternet/MainActivity.java
+++ b/ATMobileAnalytics/TestApp/src/main/java/com/atinternet/MainActivity.java
@@ -60,25 +60,13 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-
-        launchIntegration();
-        /*tracker = ((ATInternet) getApplication()).getTracker("IntegrationTracker", new HashMap<String, Object>() {{
+        /*tracker = ATInternet.getInstance().getTracker("IntegrationTracker", new HashMap<String, Object>() {{
             put(TrackerConfigurationKeys.LOG, "logp");
             put(TrackerConfigurationKeys.LOG_SSL, "logs");
             put(TrackerConfigurationKeys.SITE, 552987);
-        }});
-        tracker.setDefaultListener();
-
-        findViewById(R.id.sendHit).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                tracker.Screens().add(MainActivity.this).sendView();
-                tracker2.Screens().add(MainActivity.this).sendView();
-            }
-        });
+        }});*/
 
-
-        Debugger.create(this, tracker);*/
+        launchIntegration();
     }
 
     @Override
@@ -95,13 +83,12 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
     private void launchIntegration() {
         try {
             expectedResultsMap = getExpectedResults();
-            tracker = ((ATInternet) getApplication()).getTracker("IntegrationTracker", new HashMap<String, Object>() {{
+            tracker = ATInternet.getInstance().getTracker("IntegrationTracker", new HashMap<String, Object>() {{
                 put(TrackerConfigurationKeys.LOG, config.getString(LOG));
                 put(TrackerConfigurationKeys.LOG_SSL, config.getString(LOG_SSL));
                 put(TrackerConfigurationKeys.SITE, config.getString(SITE));
             }});
-            tracker.setParam("idclient", "Custom-ClientID");
-
+            tracker.setUserId("Custom-ClientID");
 
             tracker.setListener(new TrackerListener() {
                 @Override
diff --git a/ATMobileAnalytics/TestApp/src/main/java/com/atinternet/Operation.java b/ATMobileAnalytics/TestApp/src/main/java/com/atinternet/Operation.java
old mode 100644
new mode 100755
diff --git a/ATMobileAnalytics/TestApp/src/main/java/com/atinternet/SecondScreenActivity.java b/ATMobileAnalytics/TestApp/src/main/java/com/atinternet/SecondScreenActivity.java
deleted file mode 100644
index 7385ba28..00000000
--- a/ATMobileAnalytics/TestApp/src/main/java/com/atinternet/SecondScreenActivity.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.atinternet;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-import com.atinternet.tracker.Tracker;
-
-public class SecondScreenActivity extends Activity {
-
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.second_layout);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        final Tracker mySpecificTracker = new Tracker(this);
-
-        mySpecificTracker.Screens().add("SecondScreen").sendView();
-    }
-}
diff --git a/ATMobileAnalytics/TestApp/src/main/java/com/atinternet/TestAppClass.java b/ATMobileAnalytics/TestApp/src/main/java/com/atinternet/TestAppClass.java
deleted file mode 100644
index 9551cc09..00000000
--- a/ATMobileAnalytics/TestApp/src/main/java/com/atinternet/TestAppClass.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.atinternet;
-
-import com.atinternet.tracker.ATInternet;
-
-public class TestAppClass extends ATInternet {
-    @Override
-    public void onCreate() {
-        super.onCreate();
-    }
-}
diff --git a/ATMobileAnalytics/TestApp/src/main/res/drawable-hdpi/ic_launcher.png b/ATMobileAnalytics/TestApp/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 96a442e5..00000000
Binary files a/ATMobileAnalytics/TestApp/src/main/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/ATMobileAnalytics/TestApp/src/main/res/drawable-mdpi/ic_launcher.png b/ATMobileAnalytics/TestApp/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 359047df..00000000
Binary files a/ATMobileAnalytics/TestApp/src/main/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/ATMobileAnalytics/TestApp/src/main/res/drawable-xhdpi/ic_launcher.png b/ATMobileAnalytics/TestApp/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 71c6d760..00000000
Binary files a/ATMobileAnalytics/TestApp/src/main/res/drawable-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/ATMobileAnalytics/TestApp/src/main/res/drawable-xxhdpi/ic_launcher.png b/ATMobileAnalytics/TestApp/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index 4df18946..00000000
Binary files a/ATMobileAnalytics/TestApp/src/main/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/ATMobileAnalytics/TestApp/src/main/res/drawable/atinternet_logo.png b/ATMobileAnalytics/TestApp/src/main/res/drawable/atinternet_logo.png
old mode 100644
new mode 100755
diff --git a/ATMobileAnalytics/TestApp/src/main/res/layout/activity_main.xml b/ATMobileAnalytics/TestApp/src/main/res/layout/activity_main.xml
old mode 100644
new mode 100755
diff --git a/ATMobileAnalytics/TestApp/src/main/res/layout/main_layout.xml b/ATMobileAnalytics/TestApp/src/main/res/layout/main_layout.xml
deleted file mode 100644
index 565cb121..00000000
--- a/ATMobileAnalytics/TestApp/src/main/res/layout/main_layout.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/scrollView"
-    android:visibility="gone"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <Button
-            android:id="@+id/sendHit"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="SendHit"/>
-
-        <Button
-            android:id="@+id/changeSite"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Change Site"/>
-
-        <Button
-            android:id="@+id/changeOfflineMode"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Change OfflineMode"/>
-
-        <Button
-            android:id="@+id/changeId"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Change Id"/>
-
-        <Button
-            android:id="@+id/changeHash"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Change Hash Mode"/>
-
-        <Button
-            android:id="@+id/changeCrashDetection"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Change CrashDetection"/>
-
-        <Button
-            android:id="@+id/changeSessionBGDuration"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Change Session Background Duration"/>
-
-        <Button
-            android:id="@+id/goToSecondScreenId"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Go to second screen"/>
-
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file
diff --git a/ATMobileAnalytics/TestApp/src/main/res/layout/second_layout.xml b/ATMobileAnalytics/TestApp/src/main/res/layout/second_layout.xml
deleted file mode 100644
index 44995166..00000000
--- a/ATMobileAnalytics/TestApp/src/main/res/layout/second_layout.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TextView
-        android:layout_width="match_parent"
-        android:gravity="center"
-        android:layout_height="match_parent"
-        android:layout_centerInParent="true"
-        android:text="Hello in the second Screen !! " />
-</RelativeLayout>
-
diff --git a/ATMobileAnalytics/TestApp/src/main/res/mipmap-hdpi/ic_launcher.png b/ATMobileAnalytics/TestApp/src/main/res/mipmap-hdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/ATMobileAnalytics/TestApp/src/main/res/mipmap-mdpi/ic_launcher.png b/ATMobileAnalytics/TestApp/src/main/res/mipmap-mdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/ATMobileAnalytics/TestApp/src/main/res/mipmap-xhdpi/ic_launcher.png b/ATMobileAnalytics/TestApp/src/main/res/mipmap-xhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/ATMobileAnalytics/TestApp/src/main/res/mipmap-xxhdpi/ic_launcher.png b/ATMobileAnalytics/TestApp/src/main/res/mipmap-xxhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/ATMobileAnalytics/TestApp/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/ATMobileAnalytics/TestApp/src/main/res/mipmap-xxxhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/ATMobileAnalytics/TestApp/src/main/res/values-v21/styles.xml b/ATMobileAnalytics/TestApp/src/main/res/values-v21/styles.xml
deleted file mode 100644
index dba3c417..00000000
--- a/ATMobileAnalytics/TestApp/src/main/res/values-v21/styles.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="AppTheme" parent="android:Theme.Material.Light">
-    </style>
-</resources>
diff --git a/ATMobileAnalytics/TestApp/src/main/res/values-w820dp/dimens.xml b/ATMobileAnalytics/TestApp/src/main/res/values-w820dp/dimens.xml
old mode 100644
new mode 100755
diff --git a/ATMobileAnalytics/TestApp/src/main/res/values/array.xml b/ATMobileAnalytics/TestApp/src/main/res/values/array.xml
deleted file mode 100644
index eb3b270b..00000000
--- a/ATMobileAnalytics/TestApp/src/main/res/values/array.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string-array name="offlineArray">
-        <item>Never</item>
-        <item>Required</item>
-        <item>Always</item>
-    </string-array>
-
-    <string-array name="TVTrackingSpotsArray">
-        <item>spotU</item>
-        <item>spot1</item>
-        <item>spot2</item>
-        <item>spot3</item>
-        <item>spot4</item>
-    </string-array>
-</resources>
\ No newline at end of file
diff --git a/ATMobileAnalytics/TestApp/src/main/res/values/colors.xml b/ATMobileAnalytics/TestApp/src/main/res/values/colors.xml
old mode 100644
new mode 100755
diff --git a/ATMobileAnalytics/TestApp/src/main/res/values/dimens.xml b/ATMobileAnalytics/TestApp/src/main/res/values/dimens.xml
old mode 100644
new mode 100755
diff --git a/ATMobileAnalytics/TestApp/src/main/res/values/strings.xml b/ATMobileAnalytics/TestApp/src/main/res/values/strings.xml
old mode 100644
new mode 100755
diff --git a/ATMobileAnalytics/TestApp/src/main/res/values/styles.xml b/ATMobileAnalytics/TestApp/src/main/res/values/styles.xml
old mode 100644
new mode 100755
diff --git a/ATMobileAnalytics/Tracker/Tracker.iml b/ATMobileAnalytics/Tracker/Tracker.iml
index 43de8f6c..3e6dfdbc 100644
--- a/ATMobileAnalytics/Tracker/Tracker.iml
+++ b/ATMobileAnalytics/Tracker/Tracker.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":Tracker" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.atinternet" external.system.module.version="2.2.2" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":Tracker" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -9,7 +9,6 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <afterSyncTasks>
@@ -20,95 +19,130 @@
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
         <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-        <option name="LIBRARY_PROJECT" value="true" />
+        <option name="PROJECT_TYPE" value="1" />
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <exclude-output />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/typedefs.txt" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
-      <excludeFolder url="file://$MODULE_DIR$/build/test-results" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" scope="TEST" name="backport-util-concurrent-3.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="maven-profile-2.2.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="xercesMinimal-1.9.6.2" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="maven-settings-2.2.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="hamcrest-library-1.3" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="asm-commons-5.0.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="accessibility-test-framework-2.1" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-24.0.0" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="wagon-http-lightweight-1.0-beta-6" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="nekohtml-1.9.6.2" level="project" />
+    <orderEntry type="library" exported="" name="play-services-gass-10.2.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="asm-5.0.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="maven-repository-metadata-2.2.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="maven-model-2.2.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="xmlpull-1.1.3.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="robolectric-annotations-3.1.2" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="icu4j-53.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="robolectric-utils-3.1.2" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="robolectric-3.1.2" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="asm-tree-5.0.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="sqlite4java-0.282" level="project" />
+    <orderEntry type="library" exported="" name="play-services-basement-10.2.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="maven-project-2.2.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="plexus-container-default-1.0-alpha-9-stable-1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="classworlds-1.1-alpha-2" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="plexus-interpolation-1.11" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="maven-artifact-manager-2.2.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="shadows-core-v23-3.1.2" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="maven-ant-tasks-2.1.3" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="ant-1.8.0" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="commons-codec-1.3" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="robolectric-annotations-2.4" level="project" />
-    <orderEntry type="library" exported="" name="play-services-basement-9.0.0" level="project" />
-    <orderEntry type="library" exported="" name="play-services-base-9.0.0" level="project" />
-    <orderEntry type="library" exported="" name="play-services-tasks-9.0.0" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="asm-commons-5.0.1" level="project" />
+    <orderEntry type="library" exported="" name="play-services-base-10.2.1" level="project" />
+    <orderEntry type="library" exported="" name="play-services-tasks-10.2.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="ant-launcher-1.8.0" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="sqlite4java-0.282" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="asm-tree-5.0.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="asm-5.0.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="xpp3_min-1.1.4c" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="maven-error-diagnostics-2.2.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="wagon-file-1.0-beta-6" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="xstream-1.4.8" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="wagon-provider-api-1.0-beta-6" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="asm-util-5.0.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="bcprov-jdk16-1.46" level="project" />
+    <orderEntry type="library" exported="" name="play-services-ads-lite-10.2.1" level="project" />
+    <orderEntry type="library" exported="" name="play-services-clearcut-10.2.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="wagon-http-shared-1.0-beta-6" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="maven-artifact-2.2.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="guava-19.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-ads-10.2.1" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-24.0.0" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="plexus-utils-1.5.15" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="maven-plugin-registry-2.2.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="asm-analysis-5.0.1" level="project" />
-    <orderEntry type="library" exported="" name="play-services-ads-9.0.0" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="robolectric-resources-3.1.2" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="protobuf-java-2.6.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="vtd-xml-2.11" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="asm-util-5.0.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.1" level="project" />
-    <orderEntry type="library" exported="" name="play-services-ads-lite-9.0.0" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-23.0.0" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="junit-4.10" level="project" />
-    <orderEntry type="library" exported="" name="firebase-common-9.0.0" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="robolectric-2.4" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-23.0.0" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="objenesis-1.3" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/ATMobileAnalytics/Tracker/build.gradle b/ATMobileAnalytics/Tracker/build.gradle
index 7d5f3f21..4f7a4853 100644
--- a/ATMobileAnalytics/Tracker/build.gradle
+++ b/ATMobileAnalytics/Tracker/build.gradle
@@ -4,8 +4,7 @@ apply plugin: 'com.jfrog.bintray'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.2"
-
+    buildToolsVersion "25.0.3"
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 25
@@ -30,7 +29,7 @@ android {
 def siteUrl = 'https://github.com/at-internet/atinternet-android-sdk'
 def gitUrl = 'https://github.com/at-internet/atinternet-android-sdk.git'
 group = "com.atinternet"
-version = "2.3.4"
+version = "2.3.5"
 
 install {
     repositories.mavenInstaller {
@@ -49,7 +48,6 @@ install {
                     connection gitUrl
                     developerConnection gitUrl
                     url siteUrl
-
                 }
             }
         }
@@ -61,7 +59,6 @@ bintray {
     properties.load(project.rootProject.file('local.properties').newDataInputStream())
     user = properties.getProperty("bintray.user")
     key = properties.getProperty("bintray.apikey")
-
     configurations = ['archives']
     pkg {
         repo = "maven"
@@ -72,42 +69,97 @@ bintray {
         publish = true
     }
 }
-
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    provided 'com.google.android.gms:play-services-ads:10.2.0'
-    testCompile 'org.robolectric:robolectric:3.1.2'
-    testCompile 'junit:junit:4.10'
-}
-
-task clearJar(type: Delete) {
-    delete 'build/outputs/jar/Tracker.jar'
-}
-
-task makeJar(type: Copy) {
-    from('build/intermediates/bundles/release/')
-    into('build/outputs/jar')
-    include('classes.jar')
-    rename ('classes.jar', 'Tracker.jar')
+    provided 'com.google.android.gms:play-services-ads:10.2.4'
+    testCompile 'org.robolectric:robolectric:3.3.2'
+    testCompile 'junit:junit:4.12'
 }
 
-makeJar.dependsOn(clearJar, build)
-
 task sourcesJar(type: Jar) {
     from android.sourceSets.main.java.srcDirs
     classifier = 'sources'
 }
 
 task javadoc(type: Javadoc) {
+    delete 'technicalDoc/' + version
     source = android.sourceSets.main.java.srcDirs
     classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+    destinationDir = new File(projectDir, "technicalDoc/" + version)
+
+    options.memberLevel = JavadocMemberLevel.PUBLIC
+    options.header = "ATInternet Android SDK API " + version
+    options.stylesheetFile = new File(projectDir, "docs-res/style.css");
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
     classifier = 'javadoc'
     from javadoc.destinationDir
 }
+
 artifacts {
     archives javadocJar
     archives sourcesJar
 }
+
+task createAlphaDelivery {
+    doLast {
+        def destination = 'delivery/' + version + 'a/'
+        copy {
+            from 'build/outputs/aar/'
+            into destination
+            include('Tracker-release.aar')
+            rename('Tracker-release.aar', 'Tracker.aar')
+        }
+        copy {
+            from 'build/intermediates/bundles/default/'
+            into destination
+            include('classes.jar')
+            rename('classes.jar', 'Tracker.jar')
+        }
+        copy {
+            from '.'
+            include '*.manifest.json'
+            into destination
+        }
+    }
+}
+
+task createProdDelivery {
+    doLast {
+        def destination = 'delivery/' + version + '/'
+        copy {
+            from 'build/outputs/aar/'
+            into destination
+            include('Tracker-release.aar')
+            rename('Tracker-release.aar', 'Tracker.aar')
+        }
+        copy {
+            from 'build/intermediates/bundles/default/'
+            into destination
+            include('classes.jar')
+            rename('classes.jar', 'Tracker.jar')
+        }
+        copy {
+            from '.'
+            include '*.manifest.json'
+            into destination
+        }
+        task(createZipFromJar, type: Zip) {
+            from destination
+            include 'Tracker.jar'
+            archiveName 'ATInternet_Android_SDK_' + version + '.zip'
+            destinationDir projectDir
+        }.execute()
+    }
+}
+
+task clearDelivery(type: Delete) {
+    delete 'delivery/'
+    delete 'technicalDoc/'
+    delete 'ATInternet_Android_SDK_' + version + '.zip'
+
+}
+
+createAlphaDelivery.dependsOn(clearDelivery, build)
+createProdDelivery.dependsOn(clearDelivery, build, javadoc)
diff --git a/ATMobileAnalytics/Tracker/core.manifest.json b/ATMobileAnalytics/Tracker/core.manifest.json
new file mode 100755
index 00000000..f7c72ac6
--- /dev/null
+++ b/ATMobileAnalytics/Tracker/core.manifest.json
@@ -0,0 +1,136 @@
+{
+  "name": "Core",
+  "description": "Geode_Tag_Android_Description",
+  "version": "2.3.5",
+  "type": "core",
+  "config": {
+    "storage": {
+      "title": "Geode_Tag_SDK_Config_Title_storage",
+      "description": "Geode_Tag_SDK_Config_Description_storage",
+      "defaultValue": "required",
+      "type": "string",
+      "public": true,
+      "global": true
+    },
+    "plugins": {
+      "title": "plugins",
+      "description": "",
+      "defaultValue": "",
+      "type": "string",
+      "public": true,
+      "global": true
+    },
+    "log": {
+      "title": "Geode_Tag_SDK_Config_Title_log",
+      "description": "",
+      "defaultValue": "",
+      "type": "string",
+      "public": true,
+      "global": true
+    },
+    "logSSL": {
+      "title": "Geode_Tag_SDK_Config_Title_logSSL",
+      "description": "",
+      "defaultValue": "",
+      "type": "string",
+      "public": true,
+      "global": true
+    },
+    "domain": {
+      "title": "Geode_Tag_SDK_Config_Title_domain",
+      "description": "",
+      "defaultValue": "xiti.com",
+      "type": "string",
+      "public": true,
+      "global": true
+    },
+    "pixelPath": {
+      "title": "Geode_Tag_SDK_Config_Title_pixelPath",
+      "description": "",
+      "defaultValue": "/hit.xiti",
+      "type": "string",
+      "public": true,
+      "global": true
+    },
+    "site": {
+      "title": "Geode_Tag_SDK_Config_Title_site",
+      "description": "Geode_Tag_SDK_Config_Description_site",
+      "defaultValue": "0",
+      "type": "int",
+      "public": true,
+      "global": true
+    },
+    "secure": {
+      "title": "Geode_Tag_SDK_Config_Title_secure",
+      "description": "Geode_Tag_SDK_Config_Description_secure",
+      "defaultValue": "false",
+      "type": "bool",
+      "public": true,
+      "global": true
+    },
+    "hashUserId": {
+      "title": "Geode_Tag_SDK_Config_Title_hashUserId",
+      "description": "Geode_Tag_SDK_Config_Description_hashUserId",
+      "defaultValue": "false",
+      "type": "bool",
+      "public": true,
+      "global": true
+    },
+    "identifier": {
+      "title": "Geode_Tag_SDK_Config_Title_identifier",
+      "description": "Geode_Tag_SDK_Config_Description_identifier_Android",
+      "defaultValue": "androidId",
+      "type": "string",
+      "public": true,
+      "global": true
+    },
+    "persistIdentifiedVisitor": {
+      "title": "Geode_Tag_SDK_Config_Title_persistIdentifiedVisitor",
+      "description": "Geode_Tag_SDK_Config_Description_persistIdentifiedVisitor",
+      "defaultValue": "true",
+      "type": "bool",
+      "public": true,
+      "global": true
+    },
+    "enableCrashDetection": {
+      "title": "Geode_Tag_SDK_Config_Title_enableCrashDetection",
+      "description": "Geode_Tag_SDK_Config_Description_enableCrashDetection",
+      "defaultValue": "true",
+      "type": "bool",
+      "public": true,
+      "global": true
+    },
+    "campaignLifetime": {
+      "title": "Geode_Tag_SDK_Config_Title_lifetime",
+      "description": "Geode_Tag_SDK_Config_Description_lifetime",
+      "defaultValue": "30",
+      "type": "int",
+      "public": true,
+      "global": true
+    },
+    "campaignLastPersistence": {
+      "title": "Geode_Tag_SDK_Config_Title_campaignLastPersistence",
+      "description": "Geode_Tag_SDK_Config_Description_campaignLastPersistence",
+      "defaultValue": "true",
+      "type": "bool",
+      "public": true,
+      "global": true
+    },
+    "sessionBackgroundDuration": {
+      "title": "Geode_Tag_SDK_Config_Title_sessionBackgroundDuration",
+      "description": "Geode_Tag_SDK_Config_Description_sessionBackgroundDuration",
+      "defaultValue": "60",
+      "type": "int",
+      "public": true,
+      "global": true
+    },
+    "downloadSource": {
+      "title": "Geode_Tag_SDK_Config_Title_downloadSource",
+      "description": "Geode_Tag_SDK_Config_Description_downloadSource",
+      "defaultValue": "int",
+      "type": "string",
+      "public": false,
+      "global": true
+    }
+  }
+}
diff --git a/ATMobileAnalytics/Tracker/docs-res/style.css b/ATMobileAnalytics/Tracker/docs-res/style.css
new file mode 100644
index 00000000..8f9796d6
--- /dev/null
+++ b/ATMobileAnalytics/Tracker/docs-res/style.css
@@ -0,0 +1,580 @@
+/* Javadoc style sheet */
+/*
+Overall document style
+*/
+
+@import url('resources/fonts/dejavu.css');
+@import url('https://fonts.googleapis.com/css?family=Nunito');
+
+body {
+    background-color:white;
+    color:#54565f;;
+    /*font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;*/
+    font-family: 'Nunito', sans-serif;
+    font-size:14px;
+    margin:0;
+}
+a:link, a:visited {
+
+    color:#4A6782;
+}
+a:hover, a:focus {
+
+    color:#072237;
+}
+a:active {
+
+    color:#4A6782;
+}
+a[name] {
+    color:#4A6782;
+}
+a[name]:hover {
+
+    color:#072237;
+}
+pre {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+}
+h1 {
+    font-size:20px;
+}
+h2 {
+    font-size:18px;
+}
+h3 {
+    font-size:16px;
+    font-style:italic;
+}
+h4 {
+    font-size:13px;
+}
+h5 {
+    font-size:12px;
+}
+h6 {
+    font-size:11px;
+}
+ul {
+    list-style-type:disc;
+}
+code, tt {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+    padding-top:4px;
+    margin-top:8px;
+    line-height:1.4em;
+}
+dt code {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+    padding-top:4px;
+}
+table tr td dt code {
+    font-family:'DejaVu Sans Mono', monospace;
+    font-size:14px;
+    vertical-align:top;
+    padding-top:4px;
+}
+sup {
+    font-size:8px;
+}
+/*
+Document title and Copyright styles
+*/
+.clear {
+    clear:both;
+    height:0px;
+    overflow:hidden;
+}
+.aboutLanguage {
+    float:right;
+    padding:0px 21px;
+    font-size:11px;
+    z-index:200;
+    margin-top:-9px;
+}
+.legalCopy {
+    margin-left:.5em;
+}
+.bar a, .bar a:link, .bar a:visited, .bar a:active {
+    color:#D3D7DC;
+    text-decoration:none;
+}
+.bar a:hover, .bar a:focus {
+    color:#072750;
+}
+.tab {
+    background-color:#0066FF;
+    color:#D3D7DC;
+    padding:8px;
+    width:5em;
+    font-weight:bold;
+}
+/*
+Navigation bar styles
+*/
+.bar {
+    background-color:#072750;
+    color:#D3D7DC;
+    padding:.8em .5em .4em .8em;
+    height:auto;/*height:1.8em;*/
+    font-size:11px;
+    margin:0;
+}
+.topNav {
+    background-color:#072750;
+    color:#D3D7DC;
+    float:left;
+    padding:0;
+    width:100%;
+    clear:right;
+    height:2.8em;
+    padding-top:10px;
+    overflow:hidden;
+    font-size:12px;
+    position:fixed;
+    z-index: 1;
+}
+.bottomNav {
+    margin-top:10px;
+    background-color:#072750;
+    color:#D3D7DC;
+    float:left;
+    padding:0;
+    width:100%;
+    clear:right;
+    height:2.8em;
+    padding-top:10px;
+    overflow:hidden;
+    font-size:12px;
+}
+.subNav {
+    background-color:#D3D7DC;
+    float:left;
+    width:100%;
+    overflow:hidden;
+    font-size:12px;
+    position: fixed;
+    top: 2.8em;
+    margin-top: 10px;
+}
+.subNav div {
+    clear:left;
+    float:left;
+    padding:0 0 5px 6px;
+    text-transform:uppercase;
+}
+ul.navList, ul.subNavList {
+    float:left;
+    margin:0 25px 0 0;
+    padding:0;
+}
+ul.navList li{
+    list-style:none;
+    float:left;
+    padding: 5px 6px;
+    text-transform:uppercase;
+}
+ul.subNavList li{
+    list-style:none;
+    float:left;
+}
+.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited {
+    color:#D3D7DC;
+    text-decoration:none;
+    text-transform:uppercase;
+    padding: 5px 6px;
+    border: 1px solid transparent;
+}
+.topNav a:hover, .bottomNav a:hover {
+    text-decoration:none;
+    color:white;
+    border: 1px solid #0cacf8;
+    border-radius: 100px;
+}
+.navBarCell1Rev {
+    /*background-color:#072750;*/
+    color:white;
+    margin: auto 5px;
+    border: 1px solid #0cacf8;
+    background: #0cacf8;
+    border-radius: 100px;
+}
+.skipNav {
+    position:absolute;
+    top:auto;
+    left:-9999px;
+    overflow:hidden;
+}
+/*
+Page header and footer styles
+*/
+.header, .footer {
+    clear:both;
+    margin:0 20px;
+    padding:100px 0 0 0;
+}
+.indexHeader {
+    margin:10px;
+    position:relative;
+}
+.indexHeader span{
+    margin-right:15px;
+}
+.indexHeader h1 {
+    font-size:13px;
+}
+.title {
+    color:#072750;
+    margin:10px 0;
+}
+.subTitle {
+    margin:5px 0 0 0;
+}
+.header ul {
+    margin:0 0 15px 0;
+    padding:0;
+}
+.footer ul {
+    margin:20px 0 5px 0;
+}
+.header ul li, .footer ul li {
+    list-style:none;
+    font-size:13px;
+}
+/*
+Heading styles
+*/
+div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
+    background-color:#D3D7DC;
+    border:1px solid #072237;
+    margin:0 0 6px -8px;
+    padding:7px 5px;
+}
+ul.blockList ul.blockList ul.blockList li.blockList h3 {
+    background-color:#D3D7DC;
+    border:1px solid #072237;
+    margin:0 0 6px -8px;
+    padding:7px 5px;
+}
+ul.blockList ul.blockList li.blockList h3 {
+    padding:0;
+    margin:15px 0;
+    color:#0cacf8;
+}
+ul.blockList li.blockList h2 {
+    padding:0px 0 20px 0;
+}
+/*
+Page layout container styles
+*/
+.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer {
+    clear:both;
+    padding:10px 20px;
+    position:relative;
+}
+.indexContainer {
+    margin:10px;
+    position:relative;
+    font-size:12px;
+}
+.indexContainer h2 {
+    font-size:13px;
+    padding:0 0 3px 0;
+}
+.indexContainer ul {
+    margin:0;
+    padding:0;
+}
+.indexContainer ul li {
+    list-style:none;
+    padding-top:2px;
+}
+.contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt {
+    font-size:12px;
+    font-weight:bold;
+    margin:10px 0 0 0;
+    color:#4E4E4E;
+}
+.contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd {
+    margin:5px 0 10px 0px;
+    font-size:14px;
+    font-family:'DejaVu Sans Mono',monospace;
+}
+.serializedFormContainer dl.nameValue dt {
+    margin-left:1px;
+    font-size:1.1em;
+    display:inline;
+    font-weight:bold;
+}
+.serializedFormContainer dl.nameValue dd {
+    margin:0 0 0 1px;
+    font-size:1.1em;
+    display:inline;
+}
+/*
+List styles
+*/
+ul.horizontal li {
+    display:inline;
+    font-size:0.9em;
+}
+ul.inheritance {
+    margin:0;
+    padding:0;
+}
+ul.inheritance li {
+    display:inline;
+    list-style:none;
+}
+ul.inheritance li ul.inheritance {
+    margin-left:15px;
+    padding-left:15px;
+    padding-top:1px;
+}
+ul.blockList, ul.blockListLast {
+    margin:10px 0 10px 0;
+    padding:0;
+    background-color: white;
+}
+ul.blockList li.blockList, ul.blockListLast li.blockList {
+    list-style:none;
+    margin-bottom:15px;
+    line-height:1.4;
+}
+ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList {
+    padding:0px 20px 5px 10px;
+    border:1px solid #072750;
+}
+ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList {
+    padding:0 0 5px 8px;
+    border:none;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockList {
+    margin-left:0;
+    padding-left:0;
+    padding-bottom:15px;
+    border:none;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast {
+    list-style:none;
+    border-bottom:none;
+    padding-bottom:0;
+}
+table tr td dl, table tr td dl dt, table tr td dl dd {
+    margin-top:0;
+    margin-bottom:1px;
+}
+/*
+Table styles
+*/
+.overviewSummary, .memberSummary, .typeSummary, .useSummary, .constantsSummary, .deprecatedSummary {
+    width:100%;
+    border:1px solid #ececec;
+}
+.overviewSummary, .memberSummary  {
+    padding:0px;
+}
+.overviewSummary caption, .memberSummary caption, .typeSummary caption,
+.useSummary caption, .constantsSummary caption, .deprecatedSummary caption {
+    position:relative;
+    text-align:left;
+    background-repeat:no-repeat;
+    color:#253441;
+    font-weight:bold;
+    clear:none;
+    overflow:hidden;
+    padding:0px;
+    padding-top:10px;
+    padding-left:1px;
+    margin:0px;
+    white-space:pre;
+}
+.overviewSummary caption a:link, .memberSummary caption a:link, .typeSummary caption a:link,
+.useSummary caption a:link, .constantsSummary caption a:link, .deprecatedSummary caption a:link,
+.overviewSummary caption a:hover, .memberSummary caption a:hover, .typeSummary caption a:hover,
+.useSummary caption a:hover, .constantsSummary caption a:hover, .deprecatedSummary caption a:hover,
+.overviewSummary caption a:active, .memberSummary caption a:active, .typeSummary caption a:active,
+.useSummary caption a:active, .constantsSummary caption a:active, .deprecatedSummary caption a:active,
+.overviewSummary caption a:visited, .memberSummary caption a:visited, .typeSummary caption a:visited,
+.useSummary caption a:visited, .constantsSummary caption a:visited, .deprecatedSummary caption a:visited {
+    text-decoration: none;
+}
+.overviewSummary caption span, .memberSummary caption span, .typeSummary caption span,
+.useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span {
+    white-space:nowrap;
+    padding-top:5px;
+    padding-left:12px;
+    padding-right:12px;
+    padding-bottom:7px;
+    display:inline-block;
+    float:left;
+    background-color:transparent;
+    border: none;
+    height:16px;
+	box-shadow: inset 0 -2px 0 0 transparent;
+}
+.memberSummary caption span.activeTableTab span {
+    white-space:nowrap;
+    padding-top:5px;
+    padding-left:12px;
+    padding-right:12px;
+    margin-right:3px;
+    display:inline-block;
+    float:left;
+    background-color:transparent;
+    height:16px;
+    box-shadow: inset 0 -2px 0 0 #0cacf8;
+}
+.memberSummary caption span.tableTab span {
+    white-space:nowrap;
+    padding-top:5px;
+    padding-left:12px;
+    padding-right:12px;
+    margin-right:3px;
+    display:inline-block;
+    float:left;
+    background-color:transparent;
+    height:16px;
+}
+.memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab {
+    padding-top:0px;
+    padding-left:0px;
+    padding-right:0px;
+    background-image:none;
+    float:none;
+    display:inline;
+}
+.overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd,
+.useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd {
+    display:none;
+    width:5px;
+    position:relative;
+    float:left;
+    background-color:#072750;
+}
+.memberSummary .activeTableTab .tabEnd {
+    display:none;
+    width:5px;
+    margin-right:3px;
+    position:relative;
+    float:left;
+    background-color:#072750;
+}
+.memberSummary .tableTab .tabEnd {
+    display:none;
+    width:5px;
+    margin-right:3px;
+    position:relative;
+    background-color:#072750;
+    float:left;
+
+}
+.overviewSummary td, .memberSummary td, .typeSummary td,
+.useSummary td, .constantsSummary td, .deprecatedSummary td {
+    text-align:left;
+    padding:0px 0px 12px 10px;
+}
+th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th,
+td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{
+    vertical-align:top;
+    padding-right:0px;
+    padding-top:8px;
+    padding-bottom:3px;
+}
+th.colFirst, th.colLast, th.colOne, .constantsSummary th {
+    background:#e1e5eb;
+    color:#262b33;
+    text-transform: uppercase;
+    font-size:0.8em;
+    text-align:left;
+    padding:8px 3px 3px 7px;
+}
+td.colFirst, th.colFirst {
+    white-space:nowrap;
+}
+.overviewSummary td.colFirst, .overviewSummary th.colFirst,
+.useSummary td.colFirst, .useSummary th.colFirst,
+.overviewSummary td.colOne, .overviewSummary th.colOne,
+.memberSummary td.colFirst, .memberSummary th.colFirst,
+.memberSummary td.colOne, .memberSummary th.colOne,
+.typeSummary td.colFirst{
+    width:25%;
+    vertical-align:top;
+}
+td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover {
+    font-weight:bold;
+}
+.tableSubHeadingColor {
+    background-color:#D3D7DC;
+}
+.altColor {
+    background-color:white;
+}
+.rowColor {
+    background-color:rgb(252, 252, 252);;
+}
+/*
+Content styles
+*/
+.description pre {
+    margin-top:0;
+}
+.deprecatedContent {
+    margin:0;
+    padding:10px 0;
+}
+.docSummary {
+    padding:0;
+}
+
+ul.blockList ul.blockList ul.blockList li.blockList h3 {
+    font-style:normal;
+}
+
+div.block {
+}
+
+td.colLast div {
+    padding-top:0px;
+}
+
+
+td.colLast a {
+    padding-bottom:3px;
+}
+/*
+Formatting effect styles
+*/
+.sourceLineNo {
+    color:green;
+    padding:0 30px 0 0;
+}
+h1.hidden {
+    visibility:hidden;
+    overflow:hidden;
+    font-size:10px;
+}
+.block {
+    display:block;
+    margin:3px 10px 2px 0px;
+}
+.deprecatedLabel, .descfrmTypeLabel, .memberNameLabel, .memberNameLink,
+.overrideSpecifyLabel, .packageHierarchyLabel, .paramLabel, .returnLabel,
+.seeLabel, .simpleTagLabel, .throwsLabel, .typeNameLabel, .typeNameLink {
+    font-weight:bold;
+}
+.deprecationComment, .emphasizedPhrase, .interfaceName {
+    font-style:italic;
+}
+
+div.block div.block span.deprecationComment, div.block div.block span.emphasizedPhrase,
+div.block div.block span.interfaceName {
+    font-style:normal;
+}
+
+div.contentContainer ul.blockList li.blockList h2{
+    padding-bottom:0px;
+}
\ No newline at end of file
diff --git a/ATMobileAnalytics/Tracker/gradle/wrapper/gradle-wrapper.jar b/ATMobileAnalytics/Tracker/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..13372aef
Binary files /dev/null and b/ATMobileAnalytics/Tracker/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/ATMobileAnalytics/Tracker/gradle/wrapper/gradle-wrapper.properties b/ATMobileAnalytics/Tracker/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..04e285f3
--- /dev/null
+++ b/ATMobileAnalytics/Tracker/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Dec 28 10:00:20 PST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/ATMobileAnalytics/Tracker/gradlew b/ATMobileAnalytics/Tracker/gradlew
new file mode 100644
index 00000000..9d82f789
--- /dev/null
+++ b/ATMobileAnalytics/Tracker/gradlew
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# 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
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# 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
+
+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" ] ; 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"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/ATMobileAnalytics/Tracker/gradlew.bat b/ATMobileAnalytics/Tracker/gradlew.bat
new file mode 100644
index 00000000..8a0b282a
--- /dev/null
+++ b/ATMobileAnalytics/Tracker/gradlew.bat
@@ -0,0 +1,90 @@
+@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
+
+@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=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@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 Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_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=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+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/ATMobileAnalytics/Tracker/local.properties b/ATMobileAnalytics/Tracker/local.properties
new file mode 100644
index 00000000..7e9e088b
--- /dev/null
+++ b/ATMobileAnalytics/Tracker/local.properties
@@ -0,0 +1,11 @@
+## This file is automatically generated by Android Studio.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Thu Oct 20 16:45:52 CEST 2016
+sdk.dir=/Users/nsagnette/Library/Android/sdk
\ No newline at end of file
diff --git a/ATMobileAnalytics/Tracker/nuggad.manifest.json b/ATMobileAnalytics/Tracker/nuggad.manifest.json
new file mode 100755
index 00000000..105a9faf
--- /dev/null
+++ b/ATMobileAnalytics/Tracker/nuggad.manifest.json
@@ -0,0 +1,6 @@
+{
+  "name": "Geode_Tag_Plg_NuggAd",
+  "description": "Plugin permettant de récupérer les informations liées à NuggAd",
+  "type": "sdkplugins",
+  "config": {}
+}
\ No newline at end of file
diff --git a/ATMobileAnalytics/Tracker/sonar-project.properties b/ATMobileAnalytics/Tracker/sonar-project.properties
deleted file mode 100755
index f2882f73..00000000
--- a/ATMobileAnalytics/Tracker/sonar-project.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-sonar.projectKey=ATAndroidTracker
-sonar.projectName=Android SDK v2
-sonar.projectVersion=2.0
-sonar.projectDescription="SDK Android v2
-
-sonar.sources=src/main
-#sonar.java.binaries=build/debug
-
-sonar.language=java
-sonar.sourceEncoding=UTF-8
-
-sonar.profile=Android Lint
diff --git a/ATMobileAnalytics/Tracker/src/main/assets/defaultConfiguration.json b/ATMobileAnalytics/Tracker/src/main/assets/defaultConfiguration.json
deleted file mode 100644
index 996dabca..00000000
--- a/ATMobileAnalytics/Tracker/src/main/assets/defaultConfiguration.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "phone": {
-    "log": "logp",
-    "logSSL": "logsPhone",
-    "domain": "xiti.com",
-    "site": 123,
-    "storageduration": 4,
-    "storage": "required",
-    "plugins": "nuggad,tvtracking",
-    "secure": false,
-    "identifier": "androidId",
-    "hashUserId": false,
-    "pixelPath": "/hit.xiti",
-    "persistIdentifiedVisitor": false,
-    "tvtURL": "test.com",
-    "tvtVisitDuration": 12,
-    "tvtSpotValidityTime": 5,
-    "enableCrashDetection": true,
-    "campaignLastPersistence": true,
-    "campaignLifetime": 10,
-    "sessionBackgroundDuration": 60,
-    "downloadSource": "int"
-  },
-  "tablet": {
-    "log": "logTablet",
-    "logSSL": "logsTablet",
-    "domain": "xiti.com",
-    "site": 456,
-    "storageduration": 4,
-    "storage": "required",
-    "plugins": "nuggad,tvtracking",
-    "secure": false,
-    "identifier": "androidId",
-    "hashUserId": false,
-    "pixelPath": "/hit.xiti",
-    "persistIdentifiedVisitor": false,
-    "tvtURL": "test.com",
-    "tvtVisitDuration": 12,
-    "tvtSpotValidityTime": 5,
-    "enableCrashDetection": true,
-    "campaignLastPersistence": true,
-    "campaignLifetime": 10,
-    "sessionBackgroundDuration": 60,
-    "downloadSource": "int"
-  }
-}
\ No newline at end of file
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Helper.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/ATFrameLayout.java
similarity index 70%
rename from ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Helper.java
rename to ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/ATFrameLayout.java
index 6687ac48..49a14d3c 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Helper.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/ATFrameLayout.java
@@ -22,25 +22,21 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
-abstract class Helper {
+import android.annotation.SuppressLint;
+import android.util.AttributeSet;
+import android.widget.FrameLayout;
 
-    /**
-     * Tracker Instance
-     */
-    Tracker tracker;
+@SuppressLint("Instantiatable")
+public class ATFrameLayout extends FrameLayout {
+    public ATFrameLayout(android.content.Context context) {
+        super(context);
+    }
 
-    /**
-     * Super constructor
-     *
-     * @param tracker Tracker
-     */
-    Helper(Tracker tracker) {
-        this.tracker = tracker;
+    public ATFrameLayout(android.content.Context context, AttributeSet attrs) {
+        super(context, attrs);
     }
 
-    /**
-     * Empty constructor
-     */
-    Helper() {
+    public ATFrameLayout(android.content.Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/OrderCustomVar.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/ATImageView.java
similarity index 71%
rename from ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/OrderCustomVar.java
rename to ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/ATImageView.java
index dc8b9383..f2a03b4e 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/OrderCustomVar.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/ATImageView.java
@@ -22,22 +22,21 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
-class OrderCustomVar {
-
-    private final int varId;
-
-    private final String value;
-
-    int getVarId() {
-        return varId;
+import android.annotation.SuppressLint;
+import android.util.AttributeSet;
+import android.widget.ImageView;
+
+@SuppressLint("Instantiatable")
+public class ATImageView extends ImageView {
+    public ATImageView(android.content.Context context) {
+        super(context);
     }
 
-    String getValue() {
-        return value;
+    public ATImageView(android.content.Context context, AttributeSet attrs) {
+        super(context, attrs);
     }
 
-    OrderCustomVar(int varId, String value) {
-        this.varId = varId;
-        this.value = value;
+    public ATImageView(android.content.Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/ATInternet.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/ATInternet.java
index e233e22a..bb58a81a 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/ATInternet.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/ATInternet.java
@@ -22,49 +22,98 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
-import android.app.Application;
-
 import java.util.HashMap;
 
-public class ATInternet extends Application {
+/**
+ * Use this class to manage tracker instances
+ */
+public class ATInternet {
 
+    /**
+     * Overlay permission Activity result code
+     */
     public static final int ALLOW_OVERLAY_INTENT_RESULT_CODE = 230; // Version number when this code appairs
 
+    private static ATInternet instance = new ATInternet();
+
+    private ATInternet() {
+    }
+
+    /**
+     * Get ATInternet singleton
+     *
+     * @return the ATInternet singleton object
+     */
+    public static ATInternet getInstance() {
+        return instance;
+    }
+
     private final HashMap<String, Tracker> trackers = new HashMap<>();
 
     /**
-     * Get the default tracker
+     * Get a tracker with "defaultTracker" name
      *
-     * @return Tracker
+     * @return Tracker instance
      */
     public Tracker getDefaultTracker() {
         return getTracker("defaultTracker");
     }
 
     /**
-     * Get a tracker with name
+     * Get a tracker with default configuration
      *
-     * @param trackerName String
-     * @return Tracker
+     * @param trackerName tracker identifier
+     * @return a new Tracker or existing instance
      */
     public Tracker getTracker(String trackerName) {
         if (!trackers.containsKey(trackerName)) {
-            Tracker tracker = new Tracker(this);
+            Tracker tracker = new Tracker();
+            trackers.put(trackerName, tracker);
+        }
+        return trackers.get(trackerName);
+    }
+
+    /**
+     * Get a tracker with default configuration
+     *
+     * @param context     current activity context
+     * @param trackerName tracker identifier
+     * @return a new Tracker or existing instance
+     */
+    public Tracker getTracker(android.content.Context context, String trackerName) {
+        if (!trackers.containsKey(trackerName)) {
+            Tracker tracker = new Tracker(context);
             trackers.put(trackerName, tracker);
         }
         return trackers.get(trackerName);
     }
 
     /**
-     * Get a tracker with name and a set the configuration
+     * Get a tracker with custom configuration
      *
-     * @param trackerName   String
-     * @param configuration HashMap
-     * @return Tracker
+     * @param trackerName   tracker identifier
+     * @param configuration custom configuration (see TrackerConfigurationKeys)
+     * @return a new Tracker or existing instance
      */
     public Tracker getTracker(String trackerName, HashMap<String, Object> configuration) {
         if (!trackers.containsKey(trackerName)) {
-            Tracker tracker = new Tracker(this, configuration);
+            Tracker tracker = new Tracker(configuration);
+            trackers.put(trackerName, tracker);
+        }
+        return trackers.get(trackerName);
+    }
+
+    /**
+     * Get a tracker with custom configuration
+     *
+     * @param context       current activity context
+     * @param trackerName   tracker identifier
+     * @param configuration custom configuration (see TrackerConfigurationKeys)
+     * @return a new Tracker or existing instance
+     */
+    public Tracker getTracker(android.content.Context context, String trackerName, HashMap<String, Object> configuration) {
+        if (!trackers.containsKey(trackerName)) {
+            Tracker tracker = new Tracker(context, configuration);
             trackers.put(trackerName, tracker);
         }
         return trackers.get(trackerName);
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/ScreenInfo.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/ATRelativeLayout.java
similarity index 68%
rename from ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/ScreenInfo.java
rename to ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/ATRelativeLayout.java
index 6dd25af1..e70331f8 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/ScreenInfo.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/ATRelativeLayout.java
@@ -22,9 +22,23 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
-abstract class ScreenInfo extends BusinessObject {
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.RelativeLayout;
 
-    ScreenInfo(Tracker tracker) {
-        super(tracker);
+@SuppressLint("Instantiatable")
+public class ATRelativeLayout extends RelativeLayout {
+    public ATRelativeLayout(android.content.Context context) {
+        super(context);
+    }
+
+    public ATRelativeLayout(android.content.Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public ATRelativeLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
     }
 }
+
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/AbstractScreen.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/AbstractScreen.java
index 87c94dea..c2b386c6 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/AbstractScreen.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/AbstractScreen.java
@@ -24,9 +24,12 @@ of this software and associated documentation files (the "Software"), to deal
 
 import java.util.LinkedHashMap;
 
+/**
+ * Abstract class to manage screen tracking
+ */
 public abstract class AbstractScreen extends BusinessObject {
 
-    public enum Action {
+    enum Action {
         View("view");
 
         private final String str;
@@ -41,11 +44,11 @@ public String stringValue() {
     }
 
 
-    String name;
-    String chapter1;
-    String chapter2;
-    String chapter3;
-    Action action;
+    protected String name;
+    protected String chapter1;
+    protected String chapter2;
+    protected String chapter3;
+    protected Action action;
     boolean isBasketScreen;
     int level2;
 
@@ -83,9 +86,9 @@ LinkedHashMap<String, PublisherImpression> getPublisherImpressionsMap() {
     }
 
     /**
-     * Get the name
+     * Get the screen name
      *
-     * @return String
+     * @return the screen name
      */
     public String getName() {
         return name;
@@ -94,16 +97,16 @@ public String getName() {
     /**
      * Get the action type
      *
-     * @return AbstractScreen.Action
+     * @return the action type
      */
     public Action getAction() {
         return action;
     }
 
     /**
-     * Get the level2
+     * Get the level 2
      *
-     * @return int
+     * @return the level 2
      */
     public int getLevel2() {
         return level2;
@@ -112,7 +115,7 @@ public int getLevel2() {
     /**
      * Get the first chapter
      *
-     * @return String
+     * @return the first chapter
      */
     public String getChapter1() {
         return chapter1;
@@ -121,7 +124,7 @@ public String getChapter1() {
     /**
      * Get the second chapter
      *
-     * @return String
+     * @return the second chapter
      */
     public String getChapter2() {
         return chapter2;
@@ -130,25 +133,25 @@ public String getChapter2() {
     /**
      * Get the third chapter
      *
-     * @return String
+     * @return the third chapter
      */
     public String getChapter3() {
         return chapter3;
     }
 
     /**
-     * Get boolean isBasketScreen value
+     * Get "isBasketScreen" value
      *
-     * @return boolean
+     * @return true is screen is basket screen
      */
     public boolean isBasketScreen() {
         return isBasketScreen;
     }
 
     /**
-     * Set a cart
+     * Attach a cart to screen
      *
-     * @param cart Cart
+     * @param cart the cart instance
      */
     public void setCart(Cart cart) {
         this.cart = cart;
@@ -156,11 +159,11 @@ public void setCart(Cart cart) {
     }
 
     /**
-     * Add location informations
+     * Attach location information to screen
      *
-     * @param latitude  double
-     * @param longitude double
-     * @return Location
+     * @param latitude  latitude x value
+     * @param longitude longitude y value
+     * @return the Location instance
      */
     public Location Location(double latitude, double longitude) {
         return location == null ? (location = new Location(tracker)
@@ -169,41 +172,41 @@ public Location Location(double latitude, double longitude) {
     }
 
     /**
-     * Add aisle informations
+     * Attach visited aisle information to screen
      *
-     * @param level1 String
-     * @return Aisle
+     * @param level1 first aisle level
+     * @return the Aisle instance
      */
     public Aisle Aisle(String level1) {
         return aisle == null ? (aisle = new Aisle(tracker).setLevel1(level1)) : aisle;
     }
 
     /**
-     * Add a custom tree structure
+     * Attach a custom tree structure to screen
      *
-     * @param category1 int
-     * @return CustomTreeStructure
+     * @param category1 first custom tree structure category
+     * @return the CustomTreeStructure instance
      */
     public CustomTreeStructure CustomTreeStructure(int category1) {
         return customTreeStructure == null ? (customTreeStructure = new CustomTreeStructure(tracker).setCategory1(category1)) : customTreeStructure;
     }
 
     /**
-     * Add campaign informations
+     * Attach campaign information to screen
      *
-     * @param campaignId String
-     * @return Campaign
+     * @param campaignId campaign identifier
+     * @return the Campaign identifier
      */
     public Campaign Campaign(String campaignId) {
         return campaign == null ? (campaign = new Campaign(tracker).setCampaignId(campaignId)) : campaign;
     }
 
     /**
-     * Add an order
+     * Attach an order to screen
      *
-     * @param orderId  String
-     * @param turnover double
-     * @return Order
+     * @param orderId  order identifier
+     * @param turnover order turnover
+     * @return the Order instance
      * @deprecated Since 2.3.4, bug was revealed when this method is used. Use Orders tracker property instead.
      */
     @Deprecated
@@ -212,11 +215,11 @@ public Order Order(String orderId, double turnover) {
     }
 
     /**
-     * Add internal search informations
+     * Attach internal search information to screen
      *
-     * @param keywordLabel     String
-     * @param resultScreenNumber int
-     * @return InternalSearch
+     * @param keywordLabel       keyword has been searched
+     * @param resultScreenNumber screen result number
+     * @return the InternalSearch instance
      */
     public InternalSearch InternalSearch(String keywordLabel, int resultScreenNumber) {
         return internalSearch == null ? (internalSearch = new InternalSearch(tracker)
@@ -225,49 +228,50 @@ public InternalSearch InternalSearch(String keywordLabel, int resultScreenNumber
     }
 
     /**
-     * Get CustomVars
+     * Get a wrapper for CustomVar management
      *
-     * @return CustomVars
+     * @return CustomVars instance
      */
     public CustomVars CustomVars() {
         return customVars == null ? (customVars = new CustomVars(this)) : customVars;
     }
 
     /**
-     * Get CustomObjects
+     * Get a wrapper for CustomObject management
      *
-     * @return CustomObjects
+     * @return CustomObjects instance
      */
     public CustomObjects CustomObjects() {
         return customObjects == null ? (customObjects = new CustomObjects(this)) : customObjects;
     }
 
     /**
-     * Get Publishers
+     * Get a wrapper for PublisherImpression management
      *
-     * @return PublisherImpressions
+     * @return PublisherImpressions instance
      */
     public PublisherImpressions Publishers() {
         return publisherImpressions == null ? (publisherImpressions = new PublisherImpressions(this)) : publisherImpressions;
     }
 
     /**
-     * Get SelfPromotions
+     * Get a wrapper for SelfPromotionImpression management
      *
-     * @return SelfPromotionImpressions
+     * @return SelfPromotionImpressions instance
      */
     public SelfPromotionImpressions SelfPromotions() {
         return selfPromotionImpressions == null ? (selfPromotionImpressions = new SelfPromotionImpressions(this)) : selfPromotionImpressions;
     }
 
     /**
-     * Send a screen view event
+     * Send the screen view event
      */
     public void sendView() {
         action = Action.View;
         tracker.getDispatcher().dispatch(this);
     }
 
+
     AbstractScreen(Tracker tracker) {
         super(tracker);
         action = Action.View;
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Aisle.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Aisle.java
index 639fcc98..22589fc2 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Aisle.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Aisle.java
@@ -22,6 +22,9 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
+/**
+ * Wrapper class for visited aisle tracking
+ */
 public class Aisle extends ScreenInfo {
 
     private String level1;
@@ -32,10 +35,14 @@ public class Aisle extends ScreenInfo {
     private String level6;
 
 
+    Aisle(Tracker tracker) {
+        super(tracker);
+    }
+
     /**
      * Get the aisle first level
      *
-     * @return String
+     * @return the aisle first level
      */
     public String getLevel1() {
         return level1;
@@ -44,7 +51,7 @@ public String getLevel1() {
     /**
      * Get the aisle second level
      *
-     * @return String
+     * @return the aisle second level
      */
     public String getLevel2() {
         return level2;
@@ -53,7 +60,7 @@ public String getLevel2() {
     /**
      * Get the aisle third level
      *
-     * @return String
+     * @return the aisle third level
      */
     public String getLevel3() {
         return level3;
@@ -62,7 +69,7 @@ public String getLevel3() {
     /**
      * Get the aisle fourth level
      *
-     * @return String
+     * @return the aisle fourth level
      */
     public String getLevel4() {
         return level4;
@@ -71,7 +78,7 @@ public String getLevel4() {
     /**
      * Get the aisle fifth level
      *
-     * @return String
+     * @return the aisle fifth level
      */
     public String getLevel5() {
         return level5;
@@ -80,7 +87,7 @@ public String getLevel5() {
     /**
      * Get the aisle sixth level
      *
-     * @return String
+     * @return the aisle sixth level
      */
     public String getLevel6() {
         return level6;
@@ -89,8 +96,8 @@ public String getLevel6() {
     /**
      * Set a new first level
      *
-     * @param level1 String
-     * @return Aisle
+     * @param level1 aisle first level
+     * @return the Aisle instance
      */
     public Aisle setLevel1(String level1) {
         this.level1 = level1;
@@ -100,8 +107,8 @@ public Aisle setLevel1(String level1) {
     /**
      * Set a new second level
      *
-     * @param level2 String
-     * @return Aisle
+     * @param level2 aisle second level
+     * @return the Aisle instance
      */
     public Aisle setLevel2(String level2) {
         this.level2 = level2;
@@ -111,8 +118,8 @@ public Aisle setLevel2(String level2) {
     /**
      * Set a new third level
      *
-     * @param level3 String
-     * @return Aisle
+     * @param level3 aisle third level
+     * @return the Aisle instance
      */
     public Aisle setLevel3(String level3) {
         this.level3 = level3;
@@ -122,8 +129,8 @@ public Aisle setLevel3(String level3) {
     /**
      * Set a new fourth level
      *
-     * @param level4 String
-     * @return Aisle
+     * @param level4 aisle fourth level
+     * @return the Aisle instance
      */
     public Aisle setLevel4(String level4) {
         this.level4 = level4;
@@ -133,19 +140,20 @@ public Aisle setLevel4(String level4) {
     /**
      * Set a new fifth level
      *
-     * @param level5 String
-     * @return Aisle
+     * @param level5 aisle fifth level
+     * @return the Aisle instance
      */
     public Aisle setLevel5(String level5) {
         this.level5 = level5;
         return this;
     }
 
+
     /**
      * Set a new sixth level
      *
-     * @param level6 String
-     * @return Aisle
+     * @param level6 aisle sixth level
+     * @return the Aisle instance
      */
     public Aisle setLevel6(String level6) {
         this.level6 = level6;
@@ -153,11 +161,6 @@ public Aisle setLevel6(String level6) {
     }
 
 
-    Aisle(Tracker tracker) {
-        super(tracker);
-    }
-
-
     @Override
     void setEvent() {
         String value = level1;
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Aisles.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Aisles.java
index 62e0a28f..be29446b 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Aisles.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Aisles.java
@@ -23,6 +23,8 @@ of this software and associated documentation files (the "Software"), to deal
 package com.atinternet.tracker;
 
 /**
+ * Wrapper class to manage Aisle instances
+ *
  * @deprecated Since 2.3.0, Aisle is now only available as a screen object property.
  */
 @Deprecated
@@ -35,8 +37,8 @@ public class Aisles extends Helper {
     /**
      * Add an aisle
      *
-     * @param level1 String
-     * @return Aisle
+     * @param level1 aisle first level
+     * @return a Aisle instance
      */
     public Aisle add(String level1) {
         Aisle aisle = new Aisle(tracker)
@@ -49,9 +51,9 @@ public Aisle add(String level1) {
     /**
      * Add an aisle
      *
-     * @param level1 String
-     * @param level2 String
-     * @return Aisle
+     * @param level1 aisle first level
+     * @param level2 aisle second level
+     * @return a Aisle instance
      */
     public Aisle add(String level1, String level2) {
         return add(level1).setLevel2(level2);
@@ -60,10 +62,10 @@ public Aisle add(String level1, String level2) {
     /**
      * Add an aisle
      *
-     * @param level1 String
-     * @param level2 String
-     * @param level3 String
-     * @return Aisle
+     * @param level1 aisle first level
+     * @param level2 aisle second level
+     * @param level3 aisle third level
+     * @return a Aisle instance
      */
     public Aisle add(String level1, String level2, String level3) {
         return add(level1, level2).setLevel3(level3);
@@ -72,11 +74,11 @@ public Aisle add(String level1, String level2, String level3) {
     /**
      * Add an aisle
      *
-     * @param level1 String
-     * @param level2 String
-     * @param level3 String
-     * @param level4 String
-     * @return Aisle
+     * @param level1 aisle first level
+     * @param level2 aisle second level
+     * @param level3 aisle third level
+     * @param level4 aisle fourth level
+     * @return a Aisle instance
      */
     public Aisle add(String level1, String level2, String level3, String level4) {
         return add(level1, level2, level3).setLevel4(level4);
@@ -85,12 +87,12 @@ public Aisle add(String level1, String level2, String level3, String level4) {
     /**
      * Add an aisle
      *
-     * @param level1 String
-     * @param level2 String
-     * @param level3 String
-     * @param level4 String
-     * @param level5 String
-     * @return Aisle
+     * @param level1 aisle first level
+     * @param level2 aisle second level
+     * @param level3 aisle third level
+     * @param level4 aisle fourth level
+     * @param level5 aisle fifth level
+     * @return a Aisle instance
      */
     public Aisle add(String level1, String level2, String level3, String level4, String level5) {
         return add(level1, level2, level3, level4).setLevel5(level5);
@@ -99,13 +101,13 @@ public Aisle add(String level1, String level2, String level3, String level4, Str
     /**
      * Add an aisle
      *
-     * @param level1 String
-     * @param level2 String
-     * @param level3 String
-     * @param level4 String
-     * @param level5 String
-     * @param level6 String
-     * @return Aisle
+     * @param level1 aisle first level
+     * @param level2 aisle second level
+     * @param level3 aisle third level
+     * @param level4 aisle fourth level
+     * @param level5 aisle fifth level
+     * @param level6 aisle sixth level
+     * @return a Aisle instance
      */
     public Aisle add(String level1, String level2, String level3, String level4, String level5, String level6) {
         return add(level1, level2, level3, level4, level5).setLevel6(level6);
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Audio.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Audio.java
index bcebde4c..d471a509 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Audio.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Audio.java
@@ -22,14 +22,23 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
+/**
+ * Wrapper class for audio media tracking
+ */
 public class Audio extends RichMedia {
 
     private int duration;
 
+    Audio(MediaPlayer player) {
+        super(player);
+        broadcastMode = BroadcastMode.Clip;
+        type = "audio";
+    }
+
     /**
      * Get the duration
      *
-     * @return int
+     * @return the duration
      */
     public int getDuration() {
         return duration;
@@ -38,8 +47,8 @@ public int getDuration() {
     /**
      * Set a new duration
      *
-     * @param duration int
-     * @return Audio
+     * @param duration /
+     * @return the Audio instance
      */
     public Audio setDuration(int duration) {
         this.duration = duration;
@@ -50,8 +59,8 @@ public Audio setDuration(int duration) {
     /**
      * Set a new name
      *
-     * @param name String
-     * @return Audio
+     * @param name /
+     * @return the Audio instance
      */
     public Audio setName(String name) {
         this.name = name;
@@ -61,8 +70,8 @@ public Audio setName(String name) {
     /**
      * Set a level 2
      *
-     * @param level2 int
-     * @return Audio
+     * @param level2 /
+     * @return the Audio instance
      */
     public Audio setLevel2(int level2) {
         this.level2 = level2;
@@ -71,10 +80,10 @@ public Audio setLevel2(int level2) {
     }
 
     /**
-     * Change boolean isBuffering value
+     * Change boolean "isBuffering" value
      *
-     * @param isBuffering boolean
-     * @return Audio
+     * @param isBuffering /
+     * @return the Audio instance
      */
     public Audio setBuffering(boolean isBuffering) {
         this.isBuffering = isBuffering;
@@ -83,10 +92,10 @@ public Audio setBuffering(boolean isBuffering) {
     }
 
     /**
-     * Change boolean isEmbedded value
+     * Change boolean "isEmbedded" value
      *
-     * @param isEmbedded boolean
-     * @return Audio
+     * @param isEmbedded /
+     * @return the Audio instance
      */
     public Audio setEmbedded(boolean isEmbedded) {
         this.isEmbedded = isEmbedded;
@@ -97,8 +106,8 @@ public Audio setEmbedded(boolean isEmbedded) {
     /**
      * Set a new first chapter
      *
-     * @param chapter1 String
-     * @return Audio
+     * @param chapter1 /
+     * @return the Audio instance
      */
     public Audio setChapter1(String chapter1) {
         this.chapter1 = chapter1;
@@ -108,8 +117,8 @@ public Audio setChapter1(String chapter1) {
     /**
      * Set a new second chapter
      *
-     * @param chapter2 String
-     * @return Audio
+     * @param chapter2 /
+     * @return the Audio instance
      */
     public Audio setChapter2(String chapter2) {
         this.chapter2 = chapter2;
@@ -119,8 +128,8 @@ public Audio setChapter2(String chapter2) {
     /**
      * Set a new third chapter
      *
-     * @param chapter3 String
-     * @return Audio
+     * @param chapter3 /
+     * @return the Audio instance
      */
     public Audio setChapter3(String chapter3) {
         this.chapter3 = chapter3;
@@ -130,8 +139,8 @@ public Audio setChapter3(String chapter3) {
     /**
      * Set a new action
      *
-     * @param action RichMedia.Action
-     * @return Audio
+     * @param action /
+     * @return the Audio instance
      */
     public Audio setAction(Action action) {
         this.action = action;
@@ -140,22 +149,16 @@ public Audio setAction(Action action) {
     }
 
     /**
-     * Set a new webdomain
+     * Set a new web domain
      *
-     * @param webDomain String
-     * @return Audio
+     * @param webDomain /
+     * @return the Audio instance
      */
     public Audio setWebDomain(String webDomain) {
         this.webDomain = webDomain;
         return this;
     }
 
-    Audio(MediaPlayer player) {
-        super(player);
-        broadcastMode = BroadcastMode.Clip;
-        type = "audio";
-    }
-
     @Override
     void setEvent() {
         super.setEvent();
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Audios.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Audios.java
index 5a2d6d7e..bab030e9 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Audios.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Audios.java
@@ -24,21 +24,24 @@ of this software and associated documentation files (the "Software"), to deal
 
 import java.util.ArrayList;
 
+/**
+ * Wrapper class to manage Audio instances
+ */
 public class Audios {
 
-    final ArrayList<Audio> list = new ArrayList<>();
     private final MediaPlayer player;
+    final ArrayList<Audio> list = new ArrayList<>();
 
     Audios(MediaPlayer player) {
         this.player = player;
     }
 
     /**
-     * Create new audio
+     * Add a new audio
      *
-     * @param name     String
-     * @param duration int
-     * @return Audio
+     * @param name     audio name
+     * @param duration audio duration
+     * @return the Audio instance
      */
     public Audio add(String name, int duration) {
         int index = -1;
@@ -65,39 +68,39 @@ public Audio add(String name, int duration) {
     }
 
     /**
-     * Create new audio
+     * Add a new audio
      *
-     * @param name     String
-     * @param chapter1 String
-     * @param duration int
-     * @return Audio
+     * @param name     audio name
+     * @param chapter1 audio first chapter
+     * @param duration audio duration
+     * @return the Audio instance
      */
     public Audio add(String name, String chapter1, int duration) {
         return add(name, duration).setChapter1(chapter1);
     }
 
     /**
-     * Create new audio
+     * Add a new audio
      *
-     * @param name     String
-     * @param chapter1 String
-     * @param chapter2 String
-     * @param duration int
-     * @return Audio
+     * @param name     audio name
+     * @param chapter1 audio first chapter
+     * @param chapter2 audio second chapter
+     * @param duration audio duration
+     * @return the Audio instance
      */
     public Audio add(String name, String chapter1, String chapter2, int duration) {
         return add(name, chapter1, duration).setChapter2(chapter2);
     }
 
     /**
-     * Create new audio
+     * Add a new audio
      *
-     * @param name     String
-     * @param chapter1 String
-     * @param chapter2 String
-     * @param chapter3 String
-     * @param duration int
-     * @return Audio
+     * @param name     audio name
+     * @param chapter1 audio first chapter
+     * @param chapter2 audio second chapter
+     * @param chapter3 audio third chapter
+     * @param duration audio duration
+     * @return the Audio instance
      */
     public Audio add(String name, String chapter1, String chapter2, String chapter3, int duration) {
         return add(name, chapter1, chapter2, duration).setChapter3(chapter3);
@@ -106,7 +109,7 @@ public Audio add(String name, String chapter1, String chapter2, String chapter3,
     /**
      * Remove an audio
      *
-     * @param name String
+     * @param name audio identified by name
      */
     public void remove(String name) {
         int length = list.size();
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Buffer.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Buffer.java
deleted file mode 100644
index 0041e411..00000000
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Buffer.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
-This SDK is licensed under the MIT license (MIT)
-Copyright (c) 2015- Applied Technologies Internet SAS (registration number B 403 261 258 - Trade and Companies Register of Bordeaux – France)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
- */
-package com.atinternet.tracker;
-
-import java.util.ArrayList;
-
-import static com.atinternet.tracker.Param.Type;
-
-/**
- * Object to stock parameters to build hit
- */
-class Buffer {
-
-    /**
-     * Collection to stock persistent parameters
-     */
-    private final ArrayList<Param> persistentParams;
-
-    /**
-     * Collection to stock volatile parameters
-     */
-    private final ArrayList<Param> volatileParams;
-
-    /**
-     * Identifier Key
-     */
-    private String identifierKey;
-
-    /**
-     * Constant closures
-     */
-    private String os;
-    private Closure osClosure;
-
-    private String device;
-    private Closure deviceClosure;
-
-    private String diagonal;
-    private Closure diagonalClosure;
-
-    private String apid;
-    private String apvr;
-    private Closure apidClosure;
-    private Closure apvrClosure;
-
-    /**
-     * Get persistent parameters
-     *
-     * @return ArrayList<Param>
-     */
-    public ArrayList<Param> getPersistentParams() {
-        return persistentParams;
-    }
-
-    /**
-     * Get volatile parameters
-     *
-     * @return ArrayList<Param>
-     */
-    public ArrayList<Param> getVolatileParams() {
-        return volatileParams;
-    }
-
-    /**
-     * Set a new user id key
-     *
-     * @param identifierKey String
-     */
-    public void setIdentifierKey(String identifierKey) {
-        this.identifierKey = identifierKey;
-        int i = 0, length = persistentParams.size();
-        boolean find = false;
-        if (length > 0) {
-            while (i < length || !find) {
-                if (persistentParams.get(i).getKey().equals(Hit.HitParam.UserId.stringValue())) {
-                    persistentParams.get(i).setValue(TechnicalContext.getUserId(identifierKey));
-                    find = true;
-                }
-                i++;
-            }
-        }
-    }
-
-    /**
-     * Default constructor
-     */
-    public Buffer(Tracker tracker) {
-        persistentParams = new ArrayList<>();
-        volatileParams = new ArrayList<>();
-        identifierKey = String.valueOf(tracker.getConfiguration().get(TrackerConfigurationKeys.IDENTIFIER));
-
-        initConstantClosures();
-        addContextVariables(tracker);
-    }
-
-    /**
-     * Add context variables in persistent parameters list
-     */
-    private void addContextVariables(Tracker tracker) {
-        // Boolean isPersistent have to be true in all cases
-        ParamOption persistent = new ParamOption().setPersistent(true);
-        ParamOption persistentWithEncoding = new ParamOption().setPersistent(true).setEncode(true);
-
-        persistentParams.add(new Param("vtag", TechnicalContext.VTAG, Type.String, persistent));
-        persistentParams.add(new Param("ptag", TechnicalContext.PTAG, Type.String, persistent));
-        persistentParams.add(new Param("lng", TechnicalContext.getLanguage(), Type.String, persistent));
-        persistentParams.add(new Param("mfmd", deviceClosure, Type.String, persistentWithEncoding));
-        persistentParams.add(new Param("os", osClosure, Type.String, persistent));
-        persistentParams.add(new Param("apid", apidClosure, Type.String, persistent));
-        persistentParams.add(new Param("apvr", apvrClosure, Type.String, persistentWithEncoding));
-        persistentParams.add(new Param("hl", TechnicalContext.getLocalHour(), Type.String, persistent));
-        persistentParams.add(new Param("r", TechnicalContext.getResolution(), Type.String, persistent));
-        persistentParams.add(new Param("dg", diagonalClosure, Type.String, persistent));
-        persistentParams.add(new Param("car", TechnicalContext.getCarrier(), Type.String, persistentWithEncoding));
-        persistentParams.add(new Param("cn", TechnicalContext.getConnectionType(), Type.String, persistentWithEncoding));
-        persistentParams.add(new Param("ts", Tool.getTimeStamp(), Type.String, persistent));
-        persistentParams.add(new Param("dls", TechnicalContext.getDownloadSource(tracker), Type.String, persistent));
-        persistentParams.add(new Param("idclient", TechnicalContext.getUserId(identifierKey), Type.String, persistent));
-    }
-
-    /**
-     * Init the constant closures
-     */
-    private void initConstantClosures() {
-        os = TechnicalContext.getOS().execute();
-        device = TechnicalContext.getDevice().execute();
-        apid = TechnicalContext.getApplicationIdentifier().execute();
-        apvr = TechnicalContext.getApplicationVersion().execute();
-        diagonal = TechnicalContext.getDiagonal().execute();
-
-        osClosure = new Closure() {
-            @Override
-            public String execute() {
-                return os;
-            }
-        };
-
-        deviceClosure = new Closure() {
-            @Override
-            public String execute() {
-                return device;
-            }
-        };
-
-        apidClosure = new Closure() {
-            @Override
-            public String execute() {
-                return apid;
-            }
-        };
-
-        apvrClosure = new Closure() {
-            @Override
-            public String execute() {
-                return apvr;
-            }
-        };
-
-        diagonalClosure = new Closure() {
-            @Override
-            public String execute() {
-                return diagonal;
-            }
-        };
-    }
-}
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Builder.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Builder.java
deleted file mode 100644
index 2257d135..00000000
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Builder.java
+++ /dev/null
@@ -1,583 +0,0 @@
-/*
-This SDK is licensed under the MIT license (MIT)
-Copyright (c) 2015- Applied Technologies Internet SAS (registration number B 403 261 258 - Trade and Companies Register of Bordeaux – France)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
- */
-
-package com.atinternet.tracker;
-
-import android.text.TextUtils;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
-
-import static com.atinternet.tracker.ParamOption.RelativePosition.last;
-import static com.atinternet.tracker.ParamOption.RelativePosition.none;
-import static com.atinternet.tracker.Tool.CallbackType;
-
-/**
- * Hit builder
- */
-class Builder implements Runnable {
-
-    // String Constants
-    private static final String EMPTY_VALUE = "";
-    private static final String PERCENT_VALUE = "%";
-    private static final String MH_PARAMETER_FORMAT = "%1$s-%2$s-%3$s";
-    private static final String MHID_FORMAT = "%02d%02d%02d%d";
-    private static final String OPT_OUT = "opt-out";
-
-    //Number of configuration part
-    private static final int REFCONFIGCHUNKS = 4;
-
-    // MH parameter max length
-    private static final int MH_PARAMETER_MAX_LENGTH = 30;
-
-    // MHERR parameter length
-    private static final int MHERR_PARAMETER_LENGTH = 8;
-
-    // hit max length
-    private static final int HIT_MAX_LENGTH = 1600;
-
-    // Max of subhits count
-    private static final int HIT_MAX_COUNT = 999;
-
-    /**
-     * Contains Tracker configuration
-     */
-    private final Configuration configuration;
-
-    /**
-     * Collection to stock persistent parameters
-     */
-    private final ArrayList<Param> persistentParams;
-
-    /**
-     * Collection to stock volatile parameters
-     */
-    private final ArrayList<Param> volatileParams;
-
-    /**
-     * Tracker instance
-     */
-    private final Tracker tracker;
-
-    /**
-     * Init a Hit builder
-     *
-     * @param tracker Tracker
-     */
-    public Builder(Tracker tracker) {
-        this.tracker = tracker;
-        this.configuration = tracker.getConfiguration();
-        this.volatileParams = new ArrayList<>(tracker.getBuffer().getVolatileParams());
-        this.persistentParams = new ArrayList<>(tracker.getBuffer().getPersistentParams());
-    }
-
-    /**
-     * Build the configuration
-     *
-     * @return String
-     */
-    private String buildConfiguration() {
-        String conf = EMPTY_VALUE;
-        int hitConfigChunks = 0;
-
-        boolean isSecure = (Boolean) configuration.get(TrackerConfigurationKeys.SECURE);
-        String log = String.valueOf(configuration.get(TrackerConfigurationKeys.LOG));
-        String logSecure = String.valueOf(configuration.get(TrackerConfigurationKeys.LOG_SSL));
-        String domain = String.valueOf(configuration.get(TrackerConfigurationKeys.DOMAIN));
-        String pixelPath = String.valueOf(configuration.get(TrackerConfigurationKeys.PIXEL_PATH));
-        String siteID = String.valueOf(configuration.get(TrackerConfigurationKeys.SITE));
-
-        if (isSecure) {
-            if (!TextUtils.isEmpty(logSecure)) {
-                conf += "https://" + logSecure + ".";
-                hitConfigChunks++;
-            }
-        } else {
-            if (!TextUtils.isEmpty(log)) {
-                conf += "http://" + log + ".";
-                hitConfigChunks++;
-            }
-        }
-        if (!TextUtils.isEmpty(domain)) {
-            conf += domain;
-            hitConfigChunks++;
-        }
-        if (!TextUtils.isEmpty(pixelPath)) {
-            conf += pixelPath;
-            hitConfigChunks++;
-        }
-
-        conf += "?s=" + siteID;
-        hitConfigChunks++;
-
-
-        if (hitConfigChunks != REFCONFIGCHUNKS) {
-            Tool.executeCallback(tracker.getListener(), CallbackType.error, "There is something wrong with configuration : " + conf);
-            conf = EMPTY_VALUE;
-        }
-
-        return conf;
-    }
-
-    /**
-     * Build the hit
-     */
-    Object[] build() {
-        ArrayList<String> prepareHitsList = new ArrayList<>();
-        ArrayList<String> hitsList = new ArrayList<>();
-        Integer countSplitHits = 1;
-        int indexError = -1;
-        String queryString = "";
-        String configuration = buildConfiguration();
-        String idClient = tracker.getInternalUserId();
-        if (idClient == null) {
-            idClient = "";
-        }
-
-        // Calcul pour connaitre la longueur maximum du hit
-        String oltParameter = Tool.getTimeStamp().execute();
-        int MAX_LENGTH_AVAILABLE = HIT_MAX_LENGTH - (configuration.length() + oltParameter.length() + MH_PARAMETER_MAX_LENGTH);
-        MAX_LENGTH_AVAILABLE -= idClient.length();
-
-        LinkedHashMap<String, Object[]> dictionary;
-        if (!TextUtils.isEmpty(configuration)) {
-            dictionary = prepareQuery();
-            Set<String> keySet = dictionary.keySet();
-
-            if (idClient.equals("") && dictionary.get(Hit.HitParam.UserId.stringValue()) != null) {
-                idClient = String.valueOf(dictionary.get(Hit.HitParam.UserId.stringValue())[1]);
-                MAX_LENGTH_AVAILABLE -= idClient.length();
-            }
-
-            // Outerloop est un label de référence si jamais une boucle doit être interrompue
-            outerloop:
-
-            for (String parameterKey : keySet) {
-                Param p = (Param) dictionary.get(parameterKey)[0];
-                String value = String.valueOf(dictionary.get(parameterKey)[1]);
-
-                // Si la valeur du paramètre est trop grande
-                if (value.length() > MAX_LENGTH_AVAILABLE) {
-
-                    // Si le paramètre est découpable
-                    if (Lists.getSliceReadyParams().contains(parameterKey)) {
-
-                        // Récupération du séparateur, de la clé et la valeur du paramètre courant
-                        String separator = p.getOptions() != null ? p.getOptions().getSeparator() : ",";
-                        String[] currentParameterString = value.split("=");
-                        String currentKey = currentParameterString[0] + "=";
-                        String currentValue = currentParameterString[1];
-
-                        // On découpe la valeur du paramètre sur son séparateur
-                        String[] valuesList = currentValue.split(separator);
-
-                        for (int i = 0; i < valuesList.length; i++) {
-                            String currentSplitValue = valuesList[i];
-
-                            // Si la valeur courante est trop grande
-                            if (currentSplitValue.length() > MAX_LENGTH_AVAILABLE) {
-                                // Erreur : Valeur trop longue non découpable
-                                indexError = countSplitHits;
-                                queryString += currentKey;
-                                int currentMaxLength = MAX_LENGTH_AVAILABLE - (MHERR_PARAMETER_LENGTH + queryString.length());
-
-                                // On cherche la position du dernier % afin d'éviter les exceptions au moment de la découpe brutale
-                                String splitError = currentSplitValue.substring(0, currentMaxLength);
-                                int lastIndexOfPercent = splitError.lastIndexOf(PERCENT_VALUE);
-
-                                if ((lastIndexOfPercent > currentMaxLength - 5) && (lastIndexOfPercent < currentMaxLength)) {
-                                    queryString += splitError.substring(0, lastIndexOfPercent);
-                                } else {
-                                    queryString += splitError;
-                                }
-                                Tool.executeCallback(tracker.getListener(), CallbackType.warning, "Multihits: Param " + parameterKey + " value still too long after slicing");
-
-                                // On retourne à l'endroit du code où se trouve outerloop
-                                break outerloop;
-                            }
-                            // Sinon si le hit déjà construit + la valeur courante est trop grand
-                            else if (queryString.length() + currentSplitValue.length() > MAX_LENGTH_AVAILABLE) {
-                                // On créé un nouveau tronçon
-                                countSplitHits++;
-                                prepareHitsList.add(queryString);
-                                queryString = idClient + currentKey + (i == 0 ? currentSplitValue : separator + currentSplitValue);
-                            }
-                            // Sinon, on continue la construction normalement
-                            else {
-                                queryString += i == 0 ? currentKey + currentSplitValue : separator + currentSplitValue;
-                            }
-                        }
-                    } else {
-                        // Erreur : le paramètre n'est pas découpable
-                        indexError = countSplitHits;
-                        Tool.executeCallback(tracker.getListener(), CallbackType.warning, "Multihits: parameter " + parameterKey + " value not allowed to be sliced");
-                        break;
-                    }
-                }
-                // Sinon, si le hit est trop grand, on le découpe entre deux paramètres
-                else if (queryString.length() + value.length() > MAX_LENGTH_AVAILABLE) {
-                    countSplitHits++;
-                    prepareHitsList.add(queryString);
-                    queryString = idClient + value;
-                }
-                //Sinon, on ne découpe pas
-                else {
-                    queryString += value;
-                }
-            }
-
-            // Si un seul hit est construit
-            if (countSplitHits == 1) {
-                if (indexError == countSplitHits) {
-                    hitsList.add(configuration + makeSubQuery("mherr", "1") + queryString);
-                } else {
-                    hitsList.add(configuration + queryString);
-                }
-            }
-            // Sinon, si le nombre de tronçons > 999, erreur
-            else if (countSplitHits > HIT_MAX_COUNT) {
-                hitsList.add(configuration + makeSubQuery("mherr", "1") + queryString);
-                Tool.executeCallback(tracker.getListener(), CallbackType.warning, "Multihits: too much hit parts");
-            }
-            // Sinon, on ajoute les hits construits à la liste de hits à envoyer
-            else {
-                prepareHitsList.add(queryString);
-                String mhID = mhIdSuffixGenerator();
-                for (int i = 0; i < countSplitHits; i++) {
-                    String countSplitHitsString = countSplitHits.toString();
-                    String mhParameter = makeSubQuery("mh", String.format(MH_PARAMETER_FORMAT, Tool.formatNumberLength(Integer.toString(i + 1), countSplitHitsString.length()), countSplitHitsString, mhID));
-                    if (indexError == (i + 1)) {
-                        hitsList.add(configuration + mhParameter + makeSubQuery("mherr", "1") + prepareHitsList.get(i));
-                    } else {
-                        hitsList.add(configuration + mhParameter + prepareHitsList.get(i));
-                    }
-                }
-            }
-            if (tracker.getListener() != null) {
-                String message = "";
-                for (String hit : hitsList) {
-                    message += hit + "\n";
-                }
-                Tool.executeCallback(tracker.getListener(), CallbackType.build, message, TrackerListener.HitStatus.Success);
-            }
-        } else {
-            Tool.executeCallback(tracker.getListener(), CallbackType.build, "Empty configuration", TrackerListener.HitStatus.Failed);
-        }
-
-        return new Object[]{hitsList, oltParameter};
-    }
-
-    @Override
-    public void run() {
-        // Récupération des éléments issus du build
-        Object[] buildResult = build();
-        ArrayList<String> urls = (ArrayList<String>) buildResult[0];
-        String oltParameter = (String) buildResult[1];
-
-        // Envoi du(des) hit(s) construit(s)
-        for (String url : urls) {
-            new Sender(tracker.getListener(), new Hit(url), false, oltParameter).send(true);
-        }
-    }
-
-    /**
-     * Organize the parameters to respect order
-     *
-     * @param completeBuffer ArrayList<Param>
-     * @return ArrayList<Param>
-     */
-    private ArrayList<Param> organizeParameters(ArrayList<Param> completeBuffer) {
-        Param lastParam = null;
-        int position;
-        boolean findFirst = false;
-        boolean findLast = false;
-        ArrayList<int[]> indexes;
-        ArrayList<Param> params = new ArrayList<>();
-
-        Param refstore = getRefOrRefstoreParam(Hit.HitParam.Refstore.stringValue(), completeBuffer);
-        Param ref = getRefOrRefstoreParam(Hit.HitParam.Referrer.stringValue(), completeBuffer);
-
-        for (Param param : completeBuffer) {
-
-            ParamOption options = param.getOptions();
-
-            if (options != null) {
-
-                switch (options.getRelativePosition()) {
-                    case first:
-                        // Insertion au début
-                        if (!findFirst) {
-                            params.add(0, param);
-                            findFirst = true;
-                        } else {
-                            Tool.executeCallback(tracker.getListener(), CallbackType.warning, "Found more than one param with relative position set to first");
-                            params.add(param);
-                        }
-                        break;
-                    case last:
-                        // Sauvegarde du dernier paramètre
-                        if (!findLast) {
-                            lastParam = param;
-                            findLast = true;
-                        } else {
-                            Tool.executeCallback(tracker.getListener(), CallbackType.warning, "Found more than one param with relative position set to last");
-                            params.add(param);
-                        }
-                        break;
-                    case before:
-                        // Insertion d'un paramètre avant celui de référence
-                        indexes = Tool.findParameterPosition(options.getRelativeParameterKey(), params);
-                        position = indexes.isEmpty() ? -1 : indexes.get(indexes.size() - 1)[1];
-                        if (position == -1) {
-                            Tool.executeCallback(tracker.getListener(), CallbackType.warning, "Relative param with key " + options.getRelativeParameterKey() + " could not be found. Param will be appended");
-                            params.add(param);
-                        } else {
-                            params.add(position, param);
-                        }
-                        break;
-                    case after:
-                        // Insertion d'un paramètre après celui de référence
-                        indexes = Tool.findParameterPosition(options.getRelativeParameterKey(), params);
-                        position = indexes.isEmpty() ? -1 : indexes.get(indexes.size() - 1)[1];
-                        if (position == -1) {
-                            Tool.executeCallback(tracker.getListener(), CallbackType.warning, "Relative param with key " + options.getRelativeParameterKey() + " could not be found. Param will be appended");
-                            params.add(param);
-                        } else {
-                            params.add(position + 1, param);
-                        }
-                        break;
-                    default:// Insertion à la suite
-                        params.add(param);
-                        break;
-                }
-            } else {
-                params.add(param);
-            }
-        }
-        // Insertion du dernier paramètre
-        if (lastParam != null) {
-            params.add(lastParam);
-        }
-
-        // Insertion du refstore si existant
-        if (refstore != null) {
-            params.add(refstore);
-        }
-
-        // Insertion du ref si existant
-        if (ref != null) {
-            params.add(ref);
-        }
-
-        return params;
-    }
-
-    /**
-     * Prepare the hit queryString
-     *
-     * @return LinkedHashMap
-     */
-    private LinkedHashMap<String, Object[]> prepareQuery() {
-        LinkedHashMap<String, Object[]> formattedParameters = new LinkedHashMap<>();
-
-        ArrayList<Param> completeBuffer = new ArrayList<Param>() {{
-            addAll(persistentParams);
-            addAll(volatileParams);
-        }};
-
-        ArrayList<Param> params = organizeParameters(completeBuffer);
-
-        for (Param p : params) {
-            String value = p.getValue().execute();
-            String key = p.getKey();
-
-            HashMap<String, String> plugins = PluginParam.get(tracker);
-            if (plugins.containsKey(key)) {
-                String pluginClass = plugins.get(key);
-                Plugin plugin;
-                try {
-                    plugin = (Plugin) Class.forName(pluginClass).newInstance();
-                    plugin.execute(tracker);
-                    value = plugin.getResponse();
-                    p.setType(Param.Type.JSON);
-                    key = Hit.HitParam.JSON.stringValue();
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    value = null;
-                }
-            } else if (key.equals(Hit.HitParam.UserId.stringValue())) {
-                if (TechnicalContext.doNotTrackEnabled(Tracker.getAppContext())) {
-                    value = OPT_OUT;
-                } else if (((Boolean) configuration.get(TrackerConfigurationKeys.HASH_USER_ID))) {
-                    value = Tool.SHA_256(value);
-                }
-                tracker.setInternalUserId(value);
-            }
-
-            if (p.getType() == Param.Type.Closure && Tool.parseJSON(value) != null) {
-                p.setType(Param.Type.JSON);
-            }
-
-            if (value != null) {
-                // Referrer processing
-                if (key.equals(Hit.HitParam.Referrer.stringValue())) {
-
-                    value = value.replace("&", "$")
-                            .replaceAll("[<>]", "");
-                }
-
-                if (p.getOptions() != null && p.getOptions().isEncode()) {
-                    value = Tool.percentEncode(value);
-                    p.getOptions().setSeparator(Tool.percentEncode(p.getOptions().getSeparator()));
-                }
-                int duplicateParamIndex = -1;
-                String duplicateParamKey = null;
-
-                Set<String> keys = formattedParameters.keySet();
-
-                String[] keySet = keys.toArray(new String[keys.size()]);
-                int length = keySet.length;
-                for (int i = 0; i < length; i++) {
-                    if (keySet[i].equals(key)) {
-                        duplicateParamIndex = i;
-                        duplicateParamKey = key;
-                        break;
-                    }
-                }
-
-                if (duplicateParamIndex != -1) {
-                    List<Object[]> values = new ArrayList<>(formattedParameters.values());
-                    Param duplicateParam = (Param) values.get(duplicateParamIndex)[0];
-                    String str = ((String) formattedParameters.get(duplicateParamKey)[1]).split("=")[0] + "=";
-                    String val = ((String) formattedParameters.get(duplicateParamKey)[1]).split("=")[1];
-
-                    if (p.getType() == Param.Type.JSON) {
-                        Object json = Tool.parseJSON(Tool.percentDecode(val));
-                        Object newJson = Tool.parseJSON(Tool.percentDecode(value));
-
-                        if (json != null && json instanceof JSONObject) {
-                            Map dictionary = Tool.toMap((JSONObject) json);
-
-                            if (newJson instanceof JSONObject) {
-                                Map newDictionary = Tool.toMap((JSONObject) newJson);
-                                dictionary.putAll(newDictionary);
-
-                                JSONObject jsonData = new JSONObject(dictionary);
-                                formattedParameters.put(key, new Object[]{duplicateParam, makeSubQuery(key, Tool.percentEncode(jsonData.toString()))});
-                            } else {
-                                Tool.executeCallback(tracker.getListener(), CallbackType.warning, "Couldn't append value to a dictionary");
-                            }
-                        } else if (json != null && json instanceof JSONArray) {
-                            try {
-                                ArrayList<Object> array = new ArrayList<>();
-                                JSONArray jArray = (JSONArray) json;
-                                for (int i = 0; i < jArray.length(); i++) {
-                                    array.add(jArray.get(i).toString());
-                                }
-                                if (newJson instanceof JSONArray) {
-                                    jArray = (JSONArray) newJson;
-                                    for (int i = 0; i < jArray.length(); i++) {
-                                        array.add(jArray.get(i).toString());
-                                    }
-                                    JSONObject jsonData = new JSONObject(array.toString());
-                                    formattedParameters.put(key, new Object[]{duplicateParam, makeSubQuery(key, Tool.percentEncode(jsonData.toString()))});
-                                } else {
-                                    Tool.executeCallback(tracker.getListener(), CallbackType.warning, "Couldn't append value to an array");
-                                }
-                            } catch (JSONException e) {
-                                Tool.executeCallback(tracker.getListener(), CallbackType.warning, "Couldn't append value to an array");
-                            }
-                        } else {
-                            Tool.executeCallback(tracker.getListener(), CallbackType.warning, "Couldn't append value to a JSON Object");
-                        }
-                    } else if (duplicateParam.getType() == Param.Type.JSON) {
-                        Tool.executeCallback(tracker.getListener(), CallbackType.warning, "Couldn't append value to a JSON Object");
-                    } else {
-                        formattedParameters.put(key, new Object[]{duplicateParam, str + val + p.getOptions().getSeparator() + value});
-                    }
-                } else {
-                    formattedParameters.put(key, new Object[]{p, makeSubQuery(key, value)});
-                }
-            }
-        }
-        return formattedParameters;
-    }
-
-    /**
-     * Generate mhIDSuffix
-     *
-     * @return String
-     */
-    private String mhIdSuffixGenerator() {
-        Random random = new Random();
-        int randId = random.nextInt(9000000) + 1000000;
-
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTime(new Date());
-        int hour = calendar.get(Calendar.HOUR_OF_DAY);
-        int minute = calendar.get(Calendar.MINUTE);
-        int second = calendar.get(Calendar.SECOND);
-
-        return String.format(Locale.getDefault(), MHID_FORMAT, hour, minute, second, randId);
-    }
-
-    /**
-     * Formatting a parameter
-     *
-     * @param key   String
-     * @param value String
-     * @return String
-     */
-    private String makeSubQuery(String key, String value) {
-        return "&" + key + "=" + value;
-    }
-
-    private Param getRefOrRefstoreParam(String key, ArrayList<Param> completeBuffer) {
-        Param ref = null;
-        ArrayList<int[]> refParamPositions = Tool.findParameterPosition(key, completeBuffer);
-        int indexRef = refParamPositions.isEmpty() ? -1 : refParamPositions.get(refParamPositions.size() - 1)[1];
-
-        if (indexRef != -1) {
-            ref = completeBuffer.remove(indexRef);
-            if (ref.getOptions() != null &&
-                    ref.getOptions().getRelativePosition() != last &&
-                    ref.getOptions().getRelativePosition() != none) {
-                Tool.executeCallback(tracker.getListener(), CallbackType.warning, key + "= parameter will be put in last position");
-            }
-        }
-
-        return ref;
-    }
-}
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Campaign.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Campaign.java
index fd2b29c4..5759433f 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Campaign.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Campaign.java
@@ -24,35 +24,38 @@ of this software and associated documentation files (the "Software"), to deal
 
 import android.content.SharedPreferences;
 
+/**
+ * Wrapper class for marketing campaign tracking
+ */
 public class Campaign extends ScreenInfo {
 
     private String campaignId;
 
+    Campaign(Tracker tracker) {
+        super(tracker);
+        campaignId = null;
+    }
+
     /**
-     * Get the campaignId
+     * Get the campaign identifier
      *
-     * @return String
+     * @return the campaign identifier
      */
     public String getCampaignId() {
         return campaignId;
     }
 
     /**
-     * Set a new campaignId
+     * Set a new campaign identifier
      *
-     * @param campaignId String
-     * @return Campaign
+     * @param campaignId campaign identifier
+     * @return the Campaign instance
      */
     public Campaign setCampaignId(String campaignId) {
         this.campaignId = campaignId;
         return this;
     }
 
-    Campaign(Tracker tracker) {
-        super(tracker);
-        campaignId = null;
-    }
-
     @Override
     void setEvent() {
         SharedPreferences preferences = Tracker.getPreferences();
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Campaigns.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Campaigns.java
index 3cab618a..a504acac 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Campaigns.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Campaigns.java
@@ -22,7 +22,9 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
-@Deprecated
+/**
+ * Wrapper class to manage Campaign instances
+ */
 public class Campaigns {
 
     private final Tracker tracker;
@@ -34,8 +36,8 @@ public class Campaigns {
     /**
      * Add a campaign
      *
-     * @param campaignId String
-     * @return Campaign
+     * @param campaignId campaign identifier
+     * @return a Campaign instance
      */
     public Campaign add(String campaignId) {
         Campaign campaign = new Campaign(tracker)
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Cart.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Cart.java
index 216dd01e..2a9519b8 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Cart.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Cart.java
@@ -24,6 +24,9 @@ of this software and associated documentation files (the "Software"), to deal
 
 import java.util.ArrayList;
 
+/**
+ * Wrapper class to manage your cart
+ */
 public class Cart extends BusinessObject {
 
     private String cartId;
@@ -35,47 +38,47 @@ ArrayList<Product> getProductsList() {
         return productsList == null ? (productsList = new ArrayList<>()) : productsList;
     }
 
+    Cart(Tracker tracker) {
+        super(tracker);
+        cartId = null;
+        productsList = new ArrayList<>();
+    }
+
     /**
      * Get cart products
      *
-     * @return Products
+     * @return the Products instance
      */
     public Products Products() {
         return products == null ? (products = new Products(this)) : products;
     }
 
     /**
-     * Get the cart id
+     * Get the cart identifier
      *
-     * @return String
+     * @return the cart identifier
      */
     public String getCartId() {
         return cartId;
     }
 
+
     /**
-     * Set a new cartId
+     * Set a new cart identifier
      *
-     * @param cartId String
-     * @return Cart
+     * @param cartId cart identifier
+     * @return the Cart instance
      */
     public Cart setCartId(String cartId) {
         this.cartId = cartId;
         return this;
     }
 
-
-    Cart(Tracker tracker) {
-        super(tracker);
-        cartId = null;
-        productsList = new ArrayList<>();
-    }
-
     /**
-     * Create a new cart
+     * Set a cart
      *
-     * @param cartId String
-     * @return Cart
+     * @param cartId cart identifier
+     * @return the Cart instance
      */
     public Cart set(String cartId) {
         if (this.cartId != null && !this.cartId.equals(cartId) && products != null) {
@@ -86,9 +89,9 @@ public Cart set(String cartId) {
     }
 
     /**
-     * Remove the cart
+     * Unset the cart
      *
-     * @return Cart
+     * @return the unset Cart instance
      */
     public Cart unset() {
         cartId = null;
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Closure.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Closure.java
deleted file mode 100644
index 572cd4c9..00000000
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Closure.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-This SDK is licensed under the MIT license (MIT)
-Copyright (c) 2015- Applied Technologies Internet SAS (registration number B 403 261 258 - Trade and Companies Register of Bordeaux – France)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
- */
-package com.atinternet.tracker;
-
-interface Closure {
-    String execute();
-}
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Configuration.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Configuration.java
index facdd6d4..2a03caad 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Configuration.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Configuration.java
@@ -32,6 +32,9 @@ of this software and associated documentation files (the "Software"), to deal
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 
+/**
+ * Class to manage tracker configuration
+ */
 public class Configuration extends LinkedHashMap<String, Object> {
 
     private static final String ENCODING = "UTF-8";
@@ -121,7 +124,7 @@ private JSONObject getDefaultConfiguration(boolean isTablet) {
     /**
      * Stringify configuration
      *
-     * @return String
+     * @return the pretty printed configuration
      */
     public String toString() {
         StringBuilder sb = new StringBuilder("Tracker configuration : \n");
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Context.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Context.java
index f19f72d7..6ac5aa96 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Context.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Context.java
@@ -22,13 +22,23 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
+/**
+ * Wrapper class to manage global context tracking
+ */
 public class Context {
 
     /**
      * Enum with different background mode
      */
     public enum BackgroundMode {
-        Normal, Task
+        /**
+         * Foreground tracking
+         */
+        Normal,
+        /**
+         * Tracking in background
+         */
+        Task
     }
 
     // Tracker instance
@@ -40,10 +50,14 @@ public enum BackgroundMode {
     // Tracker background mode
     private BackgroundMode backgroundMode = null;
 
+    Context(Tracker tracker) {
+        this.tracker = tracker;
+    }
+
     /**
      * Get level 2
      *
-     * @return int
+     * @return the level 2
      */
     public int getLevel2() {
         return level2;
@@ -52,7 +66,7 @@ public int getLevel2() {
     /**
      * Get the background mode
      *
-     * @return BackgroundMode
+     * @return the BackgroundMode
      */
     public BackgroundMode getBackgroundMode() {
         return backgroundMode;
@@ -61,7 +75,7 @@ public BackgroundMode getBackgroundMode() {
     /**
      * Set a new level 2
      *
-     * @param level2 int
+     * @param level2 /
      */
     public void setLevel2(int level2) {
         this.level2 = level2;
@@ -75,7 +89,7 @@ public void setLevel2(int level2) {
     /**
      * Set a new background mode
      *
-     * @param backgroundMode BackgroundMode
+     * @param backgroundMode /
      */
     public void setBackgroundMode(BackgroundMode backgroundMode) {
         this.backgroundMode = backgroundMode;
@@ -91,13 +105,4 @@ public void setBackgroundMode(BackgroundMode backgroundMode) {
             }
         }
     }
-
-    /**
-     * Default Constructor
-     *
-     * @param tracker Tracker
-     */
-    public Context(Tracker tracker) {
-        this.tracker = tracker;
-    }
 }
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Core.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Core.java
new file mode 100644
index 00000000..6a4c9351
--- /dev/null
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Core.java
@@ -0,0 +1,1889 @@
+/*
+This SDK is licensed under the MIT license (MIT)
+Copyright (c) 2015- Applied Technologies Internet SAS (registration number B 403 261 258 - Trade and Companies Register of Bordeaux – France)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+ */
+package com.atinternet.tracker;
+
+import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
+import android.app.Activity;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Point;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.os.Build;
+import android.os.Looper;
+import android.provider.Settings;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.util.DisplayMetrics;
+import android.util.Pair;
+import android.view.Display;
+import android.view.View;
+import android.view.WindowManager;
+import android.view.animation.AlphaAnimation;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.UnsupportedEncodingException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.security.MessageDigest;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+interface Closure {
+    String execute();
+}
+
+class Param {
+
+    private String key;
+    private List<Closure> values;
+    private ParamOption paramOption;
+
+    String getKey() {
+        return key;
+    }
+
+    void setKey(String key) {
+        this.key = key;
+    }
+
+    List<Closure> getValues() {
+        return values;
+    }
+
+    void setValue(Closure value) {
+        values.clear();
+        values.add(value);
+    }
+
+    void setValues(List<Closure> values) {
+        this.values = values;
+    }
+
+    ParamOption getOptions() {
+        return paramOption;
+    }
+
+    void setOptions(ParamOption paramOption) {
+        this.paramOption = paramOption;
+    }
+
+    boolean isPersistent() {
+        return paramOption != null && paramOption.isPersistent();
+    }
+
+    Param() {
+        key = "";
+        values = new ArrayList<>();
+        paramOption = null;
+    }
+
+    Param(String key, final Closure value) {
+        this();
+        this.key = key;
+        this.values = new ArrayList<Closure>() {{
+            add(value);
+        }};
+    }
+
+    Param(String key, Closure value, ParamOption paramOption) {
+        this(key, value);
+        this.paramOption = paramOption;
+    }
+}
+
+class Buffer {
+
+    private final LinkedHashMap<String, Param> persistentParams;
+    private final LinkedHashMap<String, Param> volatileParams;
+
+    private String identifierKey;
+
+    private String os;
+    private Closure osClosure;
+
+    private String device;
+    private Closure deviceClosure;
+
+    private String diagonal;
+    private Closure diagonalClosure;
+
+    private String apid;
+    private String apvr;
+    private Closure apidClosure;
+    private Closure apvrClosure;
+
+    LinkedHashMap<String, Param> getPersistentParams() {
+        return persistentParams;
+    }
+
+    LinkedHashMap<String, Param> getVolatileParams() {
+        return volatileParams;
+    }
+
+    void setIdentifierKey(String identifierKey) {
+        volatileParams.remove(Hit.HitParam.UserId.stringValue());
+        ParamOption persistent = new ParamOption().setPersistent(true);
+        persistentParams.put(Hit.HitParam.UserId.stringValue(), new Param(Hit.HitParam.UserId.stringValue(), TechnicalContext.getUserId(identifierKey), persistent));
+    }
+
+    Buffer(Tracker tracker) {
+        persistentParams = new LinkedHashMap<>();
+        volatileParams = new LinkedHashMap<>();
+        identifierKey = String.valueOf(tracker.getConfiguration().get(TrackerConfigurationKeys.IDENTIFIER));
+
+        initConstantClosures();
+        addContextVariables(tracker);
+    }
+
+    private void addContextVariables(Tracker tracker) {
+        // Boolean isPersistent have to be true in all cases
+        ParamOption persistent = new ParamOption().setPersistent(true);
+        ParamOption persistentWithEncoding = new ParamOption().setPersistent(true).setEncode(true);
+
+        persistentParams.put("vtag", new Param("vtag", TechnicalContext.VTAG, persistent));
+        persistentParams.put("ptag", new Param("ptag", TechnicalContext.PTAG, persistent));
+        persistentParams.put("lng", new Param("lng", TechnicalContext.getLanguage(), persistent));
+        persistentParams.put("mfmd", new Param("mfmd", deviceClosure, persistentWithEncoding));
+        persistentParams.put("os", new Param("os", osClosure, persistent));
+        persistentParams.put("apid", new Param("apid", apidClosure, persistent));
+        persistentParams.put("apvr", new Param("apvr", apvrClosure, persistentWithEncoding));
+        persistentParams.put("hl", new Param("hl", TechnicalContext.getLocalHour(), persistent));
+        persistentParams.put("r", new Param("r", TechnicalContext.getResolution(), persistent));
+        persistentParams.put("dg", new Param("dg", diagonalClosure, persistent));
+        persistentParams.put("car", new Param("car", TechnicalContext.getCarrier(), persistentWithEncoding));
+        persistentParams.put("cn", new Param("cn", TechnicalContext.getConnectionType(), persistentWithEncoding));
+        persistentParams.put("ts", new Param("ts", Tool.getTimeStamp(), persistent));
+        persistentParams.put("dls", new Param("dls", TechnicalContext.getDownloadSource(tracker), persistent));
+        persistentParams.put("idclient", new Param("idclient", TechnicalContext.getUserId(identifierKey), persistent));
+    }
+
+    private void initConstantClosures() {
+        os = TechnicalContext.getOS().execute();
+        device = TechnicalContext.getDevice().execute();
+        apid = TechnicalContext.getApplicationIdentifier().execute();
+        apvr = TechnicalContext.getApplicationVersion().execute();
+        diagonal = TechnicalContext.getDiagonal().execute();
+
+        osClosure = new Closure() {
+            @Override
+            public String execute() {
+                return os;
+            }
+        };
+
+        deviceClosure = new Closure() {
+            @Override
+            public String execute() {
+                return device;
+            }
+        };
+
+        apidClosure = new Closure() {
+            @Override
+            public String execute() {
+                return apid;
+            }
+        };
+
+        apvrClosure = new Closure() {
+            @Override
+            public String execute() {
+                return apvr;
+            }
+        };
+
+        diagonalClosure = new Closure() {
+            @Override
+            public String execute() {
+                return diagonal;
+            }
+        };
+    }
+}
+
+@SuppressWarnings("unchecked")
+class Builder implements Runnable {
+
+    private static final String PERCENT_VALUE = "%";
+    private static final String MH_PARAMETER_FORMAT = "%1$s-%2$s-%3$s";
+    private static final String MHID_FORMAT = "%02d%02d%02d%d";
+    private static final String OPT_OUT = "opt-out";
+    private static final int REFCONFIGCHUNKS = 4;
+    private static final int MH_PARAMETER_MAX_LENGTH = 30;
+    private static final int MHERR_PARAMETER_LENGTH = 8;
+    private static final int HIT_MAX_LENGTH = 1600;
+    private static final int HIT_MAX_COUNT = 999;
+
+    private final Configuration configuration;
+    private final LinkedHashMap<String, Param> persistentParams;
+    private final LinkedHashMap<String, Param> volatileParams;
+    private final Tracker tracker;
+
+    Builder(Tracker tracker) {
+        this.tracker = tracker;
+        this.configuration = tracker.getConfiguration();
+        this.volatileParams = new LinkedHashMap<>(tracker.getBuffer().getVolatileParams());
+        this.persistentParams = new LinkedHashMap<>(tracker.getBuffer().getPersistentParams());
+    }
+
+    String buildConfiguration() {
+        StringBuilder conf = new StringBuilder();
+        int hitConfigChunks = 0;
+
+        boolean isSecure = (Boolean) configuration.get(TrackerConfigurationKeys.SECURE);
+        String log = String.valueOf(configuration.get(TrackerConfigurationKeys.LOG));
+        String logSecure = String.valueOf(configuration.get(TrackerConfigurationKeys.LOG_SSL));
+        String domain = String.valueOf(configuration.get(TrackerConfigurationKeys.DOMAIN));
+        String pixelPath = String.valueOf(configuration.get(TrackerConfigurationKeys.PIXEL_PATH));
+        String siteID = String.valueOf(configuration.get(TrackerConfigurationKeys.SITE));
+
+        if (isSecure) {
+            if (!TextUtils.isEmpty(logSecure)) {
+                conf.append("https://")
+                        .append(logSecure)
+                        .append(".");
+                hitConfigChunks++;
+            }
+        } else {
+            if (!TextUtils.isEmpty(log)) {
+                conf.append("http://")
+                        .append(log)
+                        .append(".");
+                hitConfigChunks++;
+            }
+        }
+        if (!TextUtils.isEmpty(domain)) {
+            conf.append(domain);
+            hitConfigChunks++;
+        }
+        if (!TextUtils.isEmpty(pixelPath)) {
+            conf.append(pixelPath);
+            hitConfigChunks++;
+        }
+
+        conf.append("?s=")
+                .append(siteID);
+        hitConfigChunks++;
+
+
+        if (hitConfigChunks != REFCONFIGCHUNKS) {
+            Tool.executeCallback(tracker.getListener(), Tool.CallbackType.error, "There is something wrong with configuration : " + conf);
+            conf = new StringBuilder();
+        }
+
+        return conf.toString();
+    }
+
+    Object[] build() {
+        ArrayList<String> prepareHitsList = new ArrayList<>();
+        ArrayList<String> hitsList = new ArrayList<>();
+        Integer countSplitHits = 1;
+        int indexError = -1;
+
+        StringBuilder queryString = new StringBuilder();
+
+        String configuration = buildConfiguration();
+        String idClient = tracker.getInternalUserId();
+        if (idClient == null) {
+            idClient = "";
+        }
+
+        // Calcul pour connaitre la longueur maximum du hit
+        String oltParameter = Tool.getTimeStamp().execute();
+        int MAX_LENGTH_AVAILABLE = HIT_MAX_LENGTH - (configuration.length() + oltParameter.length() + MH_PARAMETER_MAX_LENGTH);
+        MAX_LENGTH_AVAILABLE -= idClient.length();
+
+        LinkedHashMap<String, Pair<String, String>> dictionary;
+        if (!TextUtils.isEmpty(configuration)) {
+            dictionary = prepareQuery();
+            Set<String> keySet = dictionary.keySet();
+
+            if (idClient.equals("") && dictionary.get(Hit.HitParam.UserId.stringValue()) != null) {
+                idClient = dictionary.get(Hit.HitParam.UserId.stringValue()).first;
+                MAX_LENGTH_AVAILABLE -= idClient.length();
+            }
+
+            // Outerloop est un label de référence si jamais une boucle doit être interrompue
+            outerloop:
+
+            for (String parameterKey : keySet) {
+                String value = dictionary.get(parameterKey).first;
+                String separator = dictionary.get(parameterKey).second;
+
+                // Si la valeur du paramètre est trop grande
+                if (value.length() > MAX_LENGTH_AVAILABLE) {
+
+                    // Si le paramètre est découpable
+                    if (Lists.getSliceReadyParams().contains(parameterKey)) {
+
+                        // Récupération du séparateur, de la clé et la valeur du paramètre courant
+                        String[] currentParameterString = value.split("=");
+                        String currentKey = currentParameterString[0] + "=";
+                        String currentValue = currentParameterString[1];
+
+                        // On découpe la valeur du paramètre sur son séparateur
+                        String[] valuesList = currentValue.split(separator);
+
+                        for (int i = 0; i < valuesList.length; i++) {
+                            String currentSplitValue = valuesList[i];
+
+                            // Si la valeur courante est trop grande
+                            if (currentSplitValue.length() > MAX_LENGTH_AVAILABLE) {
+                                // Erreur : Valeur trop longue non découpable
+                                indexError = countSplitHits;
+                                queryString.append(currentKey);
+                                int currentMaxLength = MAX_LENGTH_AVAILABLE - (MHERR_PARAMETER_LENGTH + queryString.length());
+
+                                // On cherche la position du dernier % afin d'éviter les exceptions au moment de la découpe brutale
+                                String splitError = currentSplitValue.substring(0, currentMaxLength);
+                                int lastIndexOfPercent = splitError.lastIndexOf(PERCENT_VALUE);
+
+                                if ((lastIndexOfPercent > currentMaxLength - 5) && (lastIndexOfPercent < currentMaxLength)) {
+                                    queryString.append(splitError.substring(0, lastIndexOfPercent));
+                                } else {
+                                    queryString.append(splitError);
+                                }
+                                Tool.executeCallback(tracker.getListener(), Tool.CallbackType.warning, "Multihits: Param " + parameterKey + " value still too long after slicing");
+
+                                // On retourne à l'endroit du code où se trouve outerloop
+                                break outerloop;
+                            }
+                            // Sinon si le hit déjà construit + la valeur courante est trop grand
+                            else if (queryString.length() + currentSplitValue.length() > MAX_LENGTH_AVAILABLE) {
+                                // On créé un nouveau tronçon
+                                countSplitHits++;
+                                prepareHitsList.add(queryString.toString());
+                                queryString = new StringBuilder()
+                                        .append(idClient)
+                                        .append(currentKey)
+                                        .append(i == 0 ? currentSplitValue : separator + currentSplitValue);
+                            }
+                            // Sinon, on continue la construction normalement
+                            else {
+                                queryString.append(i == 0 ? currentKey + currentSplitValue : separator + currentSplitValue);
+                            }
+                        }
+                    } else {
+                        // Erreur : le paramètre n'est pas découpable
+                        indexError = countSplitHits;
+                        Tool.executeCallback(tracker.getListener(), Tool.CallbackType.warning, "Multihits: parameter " + parameterKey + " value not allowed to be sliced");
+                        break;
+                    }
+                }
+                // Sinon, si le hit est trop grand, on le découpe entre deux paramètres
+                else if (queryString.length() + value.length() > MAX_LENGTH_AVAILABLE) {
+                    countSplitHits++;
+                    prepareHitsList.add(queryString.toString());
+                    queryString = new StringBuilder()
+                            .append(idClient)
+                            .append(value);
+                }
+                //Sinon, on ne découpe pas
+                else {
+                    queryString.append(value);
+                }
+            }
+
+            // Si un seul hit est construit
+            if (countSplitHits == 1) {
+                if (indexError == countSplitHits) {
+                    hitsList.add(configuration + makeSubQuery("mherr", "1") + queryString);
+                } else {
+                    hitsList.add(configuration + queryString);
+                }
+            }
+            // Sinon, si le nombre de tronçons > 999, erreur
+            else if (countSplitHits > HIT_MAX_COUNT) {
+                hitsList.add(configuration + makeSubQuery("mherr", "1") + queryString);
+                Tool.executeCallback(tracker.getListener(), Tool.CallbackType.warning, "Multihits: too much hit parts");
+            }
+            // Sinon, on ajoute les hits construits à la liste de hits à envoyer
+            else {
+                prepareHitsList.add(queryString.toString());
+                String mhID = mhIdSuffixGenerator();
+                for (int i = 0; i < countSplitHits; i++) {
+                    String countSplitHitsString = countSplitHits.toString();
+                    String mhParameter = makeSubQuery("mh", String.format(MH_PARAMETER_FORMAT, Tool.formatNumberLength(Integer.toString(i + 1), countSplitHitsString.length()), countSplitHitsString, mhID));
+                    if (indexError == (i + 1)) {
+                        hitsList.add(configuration + mhParameter + makeSubQuery("mherr", "1") + prepareHitsList.get(i));
+                    } else {
+                        hitsList.add(configuration + mhParameter + prepareHitsList.get(i));
+                    }
+                }
+            }
+            if (tracker.getListener() != null) {
+                String message = "";
+                for (String hit : hitsList) {
+                    message += hit + "\n";
+                }
+                Tool.executeCallback(tracker.getListener(), Tool.CallbackType.build, message, TrackerListener.HitStatus.Success);
+            }
+        } else {
+            Tool.executeCallback(tracker.getListener(), Tool.CallbackType.build, "Empty configuration", TrackerListener.HitStatus.Failed);
+        }
+
+        return new Object[]{hitsList, oltParameter};
+    }
+
+    @Override
+    public void run() {
+        // Récupération des éléments issus du build
+        Object[] buildResult = build();
+        ArrayList<String> urls = (ArrayList<String>) buildResult[0];
+        String oltParameter = (String) buildResult[1];
+
+        // Envoi du(des) hit(s) construit(s)
+        for (String url : urls) {
+            new Sender(tracker.getListener(), new Hit(url), false, oltParameter).send(true);
+        }
+    }
+
+    ArrayList<Param> organizeParameters(LinkedHashMap<String, Param> completeBuffer) {
+        ArrayList<Param> params = new ArrayList<>();
+        String firstParamKey = null;
+        String lastParamKey = null;
+
+        Param refstore = completeBuffer.remove(Hit.HitParam.Refstore.stringValue());
+        Param ref = completeBuffer.remove(Hit.HitParam.Referrer.stringValue());
+
+        for (Map.Entry<String, Param> entry : completeBuffer.entrySet()) {
+            Param param = entry.getValue();
+            ParamOption options = param.getOptions();
+
+            if (options != null) {
+                if (options.getRelativePosition() == ParamOption.RelativePosition.first) {
+                    firstParamKey = entry.getKey();
+                } else if (options.getRelativePosition() == ParamOption.RelativePosition.last) {
+                    lastParamKey = entry.getKey();
+                } else {
+                    params.add(param);
+                }
+            } else {
+                params.add(param);
+            }
+        }
+
+        // Insertion du premier paramètre
+        if (firstParamKey != null) {
+            params.add(0, completeBuffer.get(firstParamKey));
+        }
+
+        // Insertion du dernier paramètre
+        if (lastParamKey != null) {
+            params.add(completeBuffer.get(lastParamKey));
+        }
+
+        // Insertion du refstore si existant
+        if (refstore != null) {
+            params.add(refstore);
+        }
+
+        // Insertion du ref si existant
+        if (ref != null) {
+            params.add(ref);
+        }
+
+        return params;
+    }
+
+    LinkedHashMap<String, Pair<String, String>> prepareQuery() {
+        LinkedHashMap<String, Pair<String, String>> formattedParameters = new LinkedHashMap<>();
+
+        LinkedHashMap<String, Param> completeBuffer = new LinkedHashMap<String, Param>() {{
+            putAll(persistentParams);
+            putAll(volatileParams);
+        }};
+
+        // PLUGINS EXECUTION
+        for (String availablePlg : Lists.getAvailablePluginsParamKey()) {
+            if (completeBuffer.containsKey(availablePlg)) {
+                String pluginClass;
+                if ((pluginClass = PluginParam.get(tracker).get(Hit.HitParam.TVT.stringValue())) != null) {
+                    final Plugin plugin;
+                    try {
+                        plugin = (Plugin) Class.forName(pluginClass).newInstance();
+                        plugin.execute(tracker);
+                        completeBuffer.get(Hit.HitParam.JSON.stringValue()).getValues().add(new Closure() {
+                            @Override
+                            public String execute() {
+                                return plugin.getResponse();
+                            }
+                        });
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+
+        // ORGANISE PARAMS
+        ArrayList<Param> params = organizeParameters(completeBuffer);
+
+        // PREPARE
+        for (final Param p : params) {
+            List<Closure> paramValues = new ArrayList<Closure>() {{
+                addAll(p.getValues());
+            }};
+
+            String strValue = paramValues.remove(0).execute();
+            if (strValue != null) {
+
+                if (Tool.isJSONObject(strValue)) {
+                    try {
+                        Map result = new HashMap();
+                        result.putAll(Tool.toMap(new JSONObject(strValue)));
+                        for (Closure closureValue : paramValues) {
+                            String appendValue = closureValue.execute();
+                            if (Tool.isJSONObject(appendValue)) {
+                                result.putAll(Tool.toMap(new JSONObject(appendValue)));
+                            } else {
+                                Tool.executeCallback(tracker.getListener(), Tool.CallbackType.warning, "Couldn't append value to a JSONObject");
+                            }
+                        }
+                        strValue = new JSONObject(result).toString();
+                    } catch (JSONException e) {
+                        e.printStackTrace();
+                    }
+                } else if (Tool.isJSONArray(strValue)) {
+                    try {
+                        List result = new ArrayList();
+                        JSONArray valArray = new JSONArray(strValue);
+                        for (int i = 0; i < valArray.length(); i++) {
+                            result.add(valArray.get(i));
+                        }
+                        for (Closure closureValue : paramValues) {
+                            String appendValue = closureValue.execute();
+                            if (Tool.isJSONArray(appendValue)) {
+                                valArray = new JSONArray(appendValue);
+                                for (int i = 0; i < valArray.length(); i++) {
+                                    result.add(valArray.get(i));
+                                }
+                            } else {
+                                Tool.executeCallback(tracker.getListener(), Tool.CallbackType.warning, "Couldn't append value to an array");
+                            }
+                        }
+                        strValue = result.toString();
+                    } catch (JSONException e) {
+                        e.printStackTrace();
+                    }
+                } else {
+                    // NOT JSON
+                    for (Closure closureValue : paramValues) {
+                        strValue += p.getOptions() != null ? p.getOptions().getSeparator() : ",";
+                        strValue += closureValue.execute();
+                    }
+                }
+
+                String key = p.getKey();
+
+                if (key.equals(Hit.HitParam.UserId.stringValue())) {
+                    if (TechnicalContext.doNotTrackEnabled(Tracker.getAppContext())) {
+                        strValue = OPT_OUT;
+                    } else if (((Boolean) configuration.get(TrackerConfigurationKeys.HASH_USER_ID))) {
+                        strValue = Tool.SHA_256(strValue);
+                    }
+                    tracker.setInternalUserId(strValue);
+                } else if (key.equals(Hit.HitParam.Referrer.stringValue())) {
+                    strValue = strValue.replace("&", "$")
+                            .replaceAll("[<>]", "");
+                }
+
+                String separator = ",";
+                if (p.getOptions() != null) {
+                    separator = p.getOptions().getSeparator();
+                    if (p.getOptions().isEncode()) {
+                        strValue = Tool.percentEncode(strValue);
+                        separator = Tool.percentEncode(separator);
+                    }
+                }
+
+                formattedParameters.put(key, new Pair<>(makeSubQuery(key, strValue), separator));
+            }
+
+        }
+        return formattedParameters;
+    }
+
+    private String mhIdSuffixGenerator() {
+        Random random = new Random();
+        int randId = random.nextInt(9000000) + 1000000;
+
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(new Date());
+        int hour = calendar.get(Calendar.HOUR_OF_DAY);
+        int minute = calendar.get(Calendar.MINUTE);
+        int second = calendar.get(Calendar.SECOND);
+
+        return String.format(Locale.getDefault(), MHID_FORMAT, hour, minute, second, randId);
+    }
+
+    String makeSubQuery(String key, String value) {
+        return "&" + key + "=" + value;
+    }
+}
+
+class Sender implements Runnable {
+
+    private static final int RETRY_COUNT = 3;
+    private static final int TIMEOUT = 15000;
+    private static final String RECEIVE_FROM_SERVER_ERROR = "recvfrom";
+
+    private static boolean OfflineHitProcessing = false;
+
+    private final TrackerListener trackerListener;
+    private final Storage storage;
+
+    private final Hit hit;
+    private final String oltParameter;
+    private final boolean forceSendOfflineHits;
+
+    Sender(TrackerListener trackerListener, Hit hit, boolean forceSendOfflineHits, String... oltParameter) {
+        this.trackerListener = trackerListener;
+        this.storage = Tracker.getStorage();
+        this.hit = hit;
+        this.forceSendOfflineHits = forceSendOfflineHits;
+        this.oltParameter = oltParameter.length > 0 ? oltParameter[0] : "";
+    }
+
+    private void send(final Hit hit) {
+
+        if (storage.getOfflineMode() == Tracker.OfflineMode.always && !forceSendOfflineHits) {
+            saveHitDatabase(hit);
+        }
+        // Si pas de connexion
+        else if (TechnicalContext.getConnection() == TechnicalContext.ConnectionType.offline || (!hit.isOffline() && storage.getCountOfflineHits() > 0)) {
+            // Si le hit ne provient pas du offline
+            if (storage.getOfflineMode() != Tracker.OfflineMode.never && !hit.isOffline()) {
+                saveHitDatabase(hit);
+            }
+        } else {
+            HttpURLConnection connection = null;
+            try {
+                // Execution de la requête
+                URL url = new URL(hit.getUrl());
+                connection = (HttpURLConnection) url.openConnection();
+                connection.setReadTimeout(TIMEOUT);
+                connection.setConnectTimeout(TIMEOUT);
+                connection.connect();
+
+                int statusCode = connection.getResponseCode();
+                final String message = connection.getResponseMessage();
+
+                // Le hit n'a pas pu être envoyé
+                if (statusCode != 200) {
+                    if (storage.getOfflineMode() != Tracker.OfflineMode.never) {
+                        if (!hit.isOffline()) {
+                            saveHitDatabase(hit);
+                        } else {
+                            updateRetryCount(hit);
+                        }
+                    }
+                    Tool.executeCallback(trackerListener, Tool.CallbackType.send, message, TrackerListener.HitStatus.Failed);
+                    updateDebugger(message, "error48", false);
+                }
+                // Le hit a été envoyé
+                else {
+                    // Si le hit provient du stockage, on le supprime de la base
+                    if (hit.isOffline()) {
+                        storage.deleteHit(hit.getUrl());
+                    }
+                    Tool.executeCallback(trackerListener, Tool.CallbackType.send, hit.getUrl(), TrackerListener.HitStatus.Success);
+                    updateDebugger(hit.getUrl(), "sent48", true);
+                }
+            } catch (final Exception e) {
+                updateDebugger(e.getMessage(), "error48", false);
+                // Si une erreur est survenue au moment de la récupération du pixel de marquage mais que le hit est bien envoyé
+                if (checkExceptionServerReceiveData(e)) {
+                    // Si il s'agissait d'un hit offline, on le supprime
+                    if (hit.isOffline()) {
+                        storage.deleteHit(hit.getUrl());
+                    }
+                } else {
+                    if (storage.getOfflineMode() != Tracker.OfflineMode.never) {
+                        if (!hit.isOffline()) {
+                            saveHitDatabase(hit);
+                        } else {
+                            updateRetryCount(hit);
+                        }
+                    }
+                }
+            } finally {
+                if (connection != null) {
+                    connection.disconnect();
+                }
+            }
+        }
+    }
+
+    @Override
+    public void run() {
+        send(false);
+    }
+
+    void send(boolean includeOfflineHits) {
+        if (includeOfflineHits) {
+            Sender.sendOfflineHits(trackerListener, storage, false, forceSendOfflineHits);
+        }
+        send(hit);
+    }
+
+    static void sendOfflineHits(TrackerListener listener, Storage storage, boolean forceSendOfflineHits, boolean async) {
+        if ((storage.getOfflineMode() != Tracker.OfflineMode.always || forceSendOfflineHits) && TechnicalContext.getConnection() != TechnicalContext.ConnectionType.offline && !OfflineHitProcessing) {
+
+            if (TrackerQueue.getEnabledFillQueueFromDatabase() && storage.getCountOfflineHits() > 0) {
+                ArrayList<Hit> offlineHits = storage.getOfflineHits();
+                if (async) {
+                    TrackerQueue.setEnabledFillQueueFromDatabase(false);
+                    for (Hit hit : offlineHits) {
+                        Sender sender = new Sender(listener, hit, forceSendOfflineHits);
+                        TrackerQueue.getInstance().put(sender);
+                    }
+                    TrackerQueue.getInstance().put(new Runnable() {
+                        @Override
+                        public void run() {
+                            TrackerQueue.setEnabledFillQueueFromDatabase(true);
+                        }
+                    });
+                } else {
+                    OfflineHitProcessing = true;
+                    for (Hit hit : offlineHits) {
+                        Sender sender = new Sender(listener, hit, forceSendOfflineHits);
+                        sender.send(false);
+                    }
+                    OfflineHitProcessing = false;
+                }
+            }
+        }
+    }
+
+    private void updateRetryCount(Hit hit) {
+        int retryCount = hit.getRetry();
+        if (retryCount < RETRY_COUNT) {
+            storage.updateRetry(hit.getUrl(), retryCount + 1);
+        } else {
+            storage.deleteHit(hit.getUrl());
+        }
+    }
+
+    void saveHitDatabase(final Hit hit) {
+        final String url = storage.saveHit(hit.getUrl(), System.currentTimeMillis(), oltParameter);
+        if (!TextUtils.isEmpty(url)) {
+            Tool.executeCallback(trackerListener, Tool.CallbackType.save, hit.getUrl());
+            updateDebugger(url, "save48", true);
+        } else {
+            Tool.executeCallback(trackerListener, Tool.CallbackType.warning, "Hit could not be saved : " + hit.getUrl());
+            updateDebugger("Hit could not be saved : " + hit.getUrl(), "warning48", false);
+        }
+    }
+
+    private boolean checkExceptionServerReceiveData(Exception e) {
+        int index = 0;
+        do {
+            if (e.getStackTrace()[index].getMethodName().equals(RECEIVE_FROM_SERVER_ERROR)) {
+                return true;
+            }
+            index++;
+        }
+        while (index < e.getStackTrace().length);
+        return false;
+    }
+
+    private void updateDebugger(final String message, final String type, final boolean isHit) {
+        if (Debugger.getContext() != null) {
+            ((Activity) Debugger.getContext()).runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    Debugger.getDebuggerEvents().add(0, new Debugger.DebuggerEvent(message, type, isHit));
+                    if (Debugger.currentViewVisibleId == com.atinternet.tracker.R.id.eventViewer) {
+                        Debugger.getDebuggerEventListAdapter().notifyDataSetChanged();
+                    }
+                }
+            });
+        }
+    }
+}
+
+class Dispatcher {
+
+    private final Tracker tracker;
+
+    Dispatcher(Tracker tracker) {
+        this.tracker = tracker;
+    }
+
+    void dispatch(BusinessObject... businessObjects) {
+        ArrayList<BusinessObject> trackerObjects;
+        for (BusinessObject businessObject : businessObjects) {
+            businessObject.setEvent();
+
+            if (businessObject instanceof AbstractScreen) {
+                trackerObjects = new ArrayList<BusinessObject>() {{
+                    addAll(tracker.getBusinessObjects().values());
+                }};
+
+                boolean hasOrder = false;
+
+                for (BusinessObject object : trackerObjects) {
+                    if (((object instanceof OnAppAd && ((OnAppAd) object).getAction() == OnAppAd.Action.View)
+                            || object instanceof Order
+                            || object instanceof InternalSearch
+                            || object instanceof ScreenInfo) &&
+                            object.getTimestamp() < businessObject.getTimestamp()) {
+
+                        if (object instanceof Order) {
+                            hasOrder = true;
+                        }
+
+                        object.setEvent();
+                        tracker.getBusinessObjects().remove(object.getId());
+                    }
+                }
+
+                if (tracker.Cart().getCartId() != null && (((Screen) businessObject).isBasketScreen() || hasOrder)) {
+                    tracker.Cart().setEvent();
+                }
+            } else if (businessObject instanceof Gesture) {
+                trackerObjects = new ArrayList<BusinessObject>() {{
+                    addAll(tracker.getBusinessObjects().values());
+                }};
+
+                if (((Gesture) businessObject).getAction() == Gesture.Action.InternalSearch) {
+                    for (BusinessObject object : trackerObjects) {
+                        if ((object instanceof InternalSearch) && object.getTimestamp() < businessObject.getTimestamp()) {
+                            object.setEvent();
+                            tracker.getBusinessObjects().remove(object.getId());
+                        }
+                    }
+                }
+            }
+
+            tracker.getBusinessObjects().remove(businessObject.getId());
+            trackerObjects = new ArrayList<BusinessObject>() {{
+                addAll(tracker.getBusinessObjects().values());
+            }};
+
+            for (BusinessObject object : trackerObjects) {
+                if ((object instanceof CustomObject || object instanceof NuggAd) && object.getTimestamp() < businessObject.getTimestamp()) {
+                    object.setEvent();
+                    tracker.getBusinessObjects().remove(object.getId());
+                }
+            }
+        }
+
+        if (Hit.getHitType(tracker.getBuffer().getVolatileParams(), tracker.getBuffer().getPersistentParams()) == Hit.HitType.Screen) {
+            TechnicalContext.screenName = Tool.appendParameterValues(tracker.getBuffer().getVolatileParams().get(Hit.HitParam.Screen.stringValue()));
+            CrashDetectionHandler.setCrashLastScreen(TechnicalContext.screenName);
+
+            String level2 = Tool.appendParameterValues(tracker.getBuffer().getVolatileParams().get(Hit.HitParam.Level2.stringValue()));
+            TechnicalContext.level2 = (!TextUtils.isEmpty(level2)) ? Integer.parseInt(level2) : 0;
+
+            SharedPreferences preferences = Tracker.getPreferences();
+            if (!preferences.getBoolean(TrackerConfigurationKeys.CAMPAIGN_ADDED_KEY, false)) {
+                final String xtor = preferences.getString(TrackerConfigurationKeys.MARKETING_CAMPAIGN_SAVED, null);
+                if (xtor != null) {
+                    ParamOption beforeStcPositionWithEncoding = new ParamOption()
+                            .setRelativePosition(ParamOption.RelativePosition.before)
+                            .setRelativeParameterKey(Hit.HitParam.JSON.stringValue())
+                            .setEncode(true);
+
+                    if (preferences.getBoolean(TrackerConfigurationKeys.IS_FIRST_AFTER_INSTALL_HIT_KEY, true)) {
+                        tracker.setParam(Hit.HitParam.Source.stringValue(), xtor, beforeStcPositionWithEncoding);
+                        preferences.edit().putBoolean(TrackerConfigurationKeys.IS_FIRST_AFTER_INSTALL_HIT_KEY, false).apply();
+                    } else {
+                        tracker.setParam(Hit.HitParam.RemanentSource.stringValue(), xtor, beforeStcPositionWithEncoding);
+                    }
+                    preferences.edit().putBoolean(TrackerConfigurationKeys.CAMPAIGN_ADDED_KEY, true).apply();
+                }
+            }
+        }
+
+        setIdentifiedVisitorInfos();
+
+
+        ParamOption appendWithEncoding = new ParamOption().setAppend(true).setEncode(true).setRelativePosition(ParamOption.RelativePosition.last);
+        tracker.setParam(Hit.HitParam.JSON.stringValue(), LifeCycle.getMetrics(Tracker.getPreferences()), appendWithEncoding);
+        if ((Boolean) tracker.getConfiguration().get(TrackerConfigurationKeys.ENABLE_CRASH_DETECTION)) {
+            tracker.setParam(Hit.HitParam.JSON.stringValue(), CrashDetectionHandler.getCrashInformation(), appendWithEncoding);
+        }
+
+        final String referrer = Tracker.getPreferences().getString(TrackerConfigurationKeys.REFERRER, null);
+        if (!TextUtils.isEmpty(referrer)) {
+            tracker.setParam(Hit.HitParam.Refstore.stringValue(), referrer);
+            Tracker.getPreferences().edit().putString(TrackerConfigurationKeys.REFERRER, null).apply();
+        }
+
+        Builder builder = new Builder(tracker);
+        tracker.getBuffer().getVolatileParams().clear();
+        TrackerQueue.getInstance().put(builder);
+
+        tracker.Context().setLevel2(tracker.Context().getLevel2());
+    }
+
+    void setIdentifiedVisitorInfos() {
+        if (Boolean.parseBoolean(String.valueOf(tracker.getConfiguration().get(TrackerConfigurationKeys.PERSIST_IDENTIFIED_VISITOR)))) {
+            ParamOption beforeStcPosition = new ParamOption()
+                    .setRelativePosition(ParamOption.RelativePosition.before)
+                    .setRelativeParameterKey(Hit.HitParam.JSON.stringValue());
+
+            ParamOption beforeStcPositionWithEncoding = new ParamOption()
+                    .setRelativePosition(ParamOption.RelativePosition.before)
+                    .setRelativeParameterKey(Hit.HitParam.JSON.stringValue()).setEncode(true);
+
+            String visitorNumericID = Tracker.getPreferences().getString(IdentifiedVisitor.VISITOR_NUMERIC, null);
+            String visitorCategory = Tracker.getPreferences().getString(IdentifiedVisitor.VISITOR_CATEGORY, null);
+            String visitorTextID = Tracker.getPreferences().getString(IdentifiedVisitor.VISITOR_TEXT, null);
+            if (visitorNumericID != null) {
+                tracker.setParam(Hit.HitParam.VisitorIdentifierNumeric.stringValue(), visitorNumericID, beforeStcPosition);
+            }
+            if (visitorTextID != null) {
+                tracker.setParam(Hit.HitParam.VisitorIdentifierText.stringValue(), visitorTextID, beforeStcPositionWithEncoding);
+            }
+            if (visitorCategory != null) {
+                tracker.setParam(Hit.HitParam.VisitorCategory.stringValue(), visitorCategory, beforeStcPosition);
+            }
+        }
+    }
+}
+
+class TrackerQueue extends LinkedBlockingQueue<Runnable> {
+
+    private static boolean ENABLED_FILL_QUEUE_FROM_DATABASE = true;
+    private static TrackerQueue instance;
+    private final ScheduledExecutorService scheduledExecutorService;
+
+    static void setEnabledFillQueueFromDatabase(boolean enabled) {
+        ENABLED_FILL_QUEUE_FROM_DATABASE = enabled;
+    }
+
+    static boolean getEnabledFillQueueFromDatabase() {
+        return ENABLED_FILL_QUEUE_FROM_DATABASE;
+    }
+
+    private TrackerQueue() {
+        scheduledExecutorService = Executors.newSingleThreadScheduledExecutor();
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    Runnable runnable;
+                    while ((runnable = take()) != null) {
+                        scheduledExecutorService.execute(runnable);
+                    }
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            }
+        }).start();
+    }
+
+    static TrackerQueue getInstance() {
+        return instance == null ? (instance = new TrackerQueue()) : instance;
+    }
+
+    @Override
+    public void put(Runnable runnable) {
+        try {
+            if (runnable != null) {
+                super.put(runnable);
+            }
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+}
+
+class TechnicalContext {
+
+    static String screenName = "";
+    static int level2 = 0;
+
+    private static final int RETRY_GET_ADVERTISING_COUNT = 3;
+    private static final String ANDROID_ID_KEY = "androidId";
+    private static final String UUID_KEY = "UUID";
+
+    static final Closure VTAG = new Closure() {
+        @Override
+        public String execute() {
+            return "2.3.5";
+        }
+    };
+
+    static final Closure PTAG = new Closure() {
+        @Override
+        public String execute() {
+            return "Android";
+        }
+    };
+
+    enum ConnectionType {
+        gprs, edge, twog, threeg, threegplus, fourg, wifi, offline, unknown
+    }
+
+    static ConnectionType getConnection() {
+        android.content.Context context = Tracker.getAppContext();
+        ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(android.content.Context.CONNECTIVITY_SERVICE);
+        NetworkInfo networkInfo = connectivityManager.getActiveNetworkInfo();
+
+        TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(android.content.Context.TELEPHONY_SERVICE);
+
+        if (networkInfo != null) {
+            if (networkInfo.getType() == ConnectivityManager.TYPE_WIFI) {
+                return ConnectionType.wifi;
+            } else {
+                switch (telephonyManager.getNetworkType()) {
+                    case TelephonyManager.NETWORK_TYPE_GPRS:
+                        return ConnectionType.gprs;
+                    case TelephonyManager.NETWORK_TYPE_EDGE:
+                        return ConnectionType.edge;
+                    case TelephonyManager.NETWORK_TYPE_1xRTT:
+                        return ConnectionType.twog;
+                    case TelephonyManager.NETWORK_TYPE_CDMA:
+                    case TelephonyManager.NETWORK_TYPE_UMTS:
+                    case TelephonyManager.NETWORK_TYPE_EVDO_0:
+                    case TelephonyManager.NETWORK_TYPE_EVDO_A:
+                    case TelephonyManager.NETWORK_TYPE_EVDO_B:
+                        return ConnectionType.threeg;
+                    case TelephonyManager.NETWORK_TYPE_HSPA:
+                    case TelephonyManager.NETWORK_TYPE_HSDPA:
+                    case TelephonyManager.NETWORK_TYPE_HSUPA:
+                        return ConnectionType.threegplus;
+                    case TelephonyManager.NETWORK_TYPE_HSPAP:
+                    case TelephonyManager.NETWORK_TYPE_LTE:
+                        return ConnectionType.fourg;
+                    default:
+                        return ConnectionType.unknown;
+                }
+            }
+        } else {
+            return ConnectionType.offline;
+        }
+    }
+
+    static Closure getConnectionType() {
+        return new Closure() {
+            @Override
+            public String execute() {
+                switch (getConnection()) {
+                    case gprs:
+                        return "gprs";
+                    case edge:
+                        return "edge";
+                    case twog:
+                        return "2g";
+                    case threeg:
+                        return "3g";
+                    case threegplus:
+                        return "3g+";
+                    case fourg:
+                        return "4g";
+                    case wifi:
+                        return "wifi";
+                    case unknown:
+                        return "unknown";
+                    default:
+                        return "offline";
+                }
+            }
+        };
+    }
+
+    static Closure getCarrier() {
+        return new Closure() {
+            @Override
+            public String execute() {
+                android.content.Context context = Tracker.getAppContext();
+                TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(android.content.Context.TELEPHONY_SERVICE);
+                return telephonyManager != null ? telephonyManager.getNetworkOperatorName() : "";
+            }
+        };
+    }
+
+    static Closure getLanguage() {
+        return new Closure() {
+            @Override
+            public String execute() {
+                return Locale.getDefault() != null ? Locale.getDefault().toString().toLowerCase() : "";
+            }
+        };
+    }
+
+    static Closure getDevice() {
+        return new Closure() {
+            @Override
+            public String execute() {
+                return String.format("[%1$s]-[%2$s]", Build.BRAND, Tool.removeCharacters(Build.MODEL, " ", "-", ".").toLowerCase());
+            }
+        };
+    }
+
+    static Closure getOS() {
+        return new Closure() {
+            @Override
+            public String execute() {
+                return String.format("[android]-[%s]", Build.VERSION.RELEASE);
+            }
+        };
+    }
+
+    static Closure getLocalHour() {
+        return new Closure() {
+            @Override
+            public String execute() {
+                return new SimpleDateFormat("HH'x'mm'x'ss", Locale.getDefault()).format(new Date());
+            }
+        };
+    }
+
+    static Closure getApplicationIdentifier() {
+        return new Closure() {
+            @Override
+            public String execute() {
+                return Tracker.getAppContext().getPackageName();
+            }
+        };
+    }
+
+    static Closure getApplicationVersion() {
+        return new Closure() {
+            @Override
+            public String execute() {
+                android.content.Context context = Tracker.getAppContext();
+                String versionName = "";
+                try {
+                    if (context.getPackageManager() != null &&
+                            context.getPackageName() != null &&
+                            context.getPackageManager().getPackageInfo(context.getPackageName(), 0) != null) {
+
+                        versionName = context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionName;
+                    }
+                } catch (PackageManager.NameNotFoundException e) {
+                    e.printStackTrace();
+                }
+                return String.format("[%s]", versionName);
+            }
+        };
+    }
+
+    static Closure getResolution() {
+        return new Closure() {
+            @Override
+            public String execute() {
+                android.content.Context context = Tracker.getAppContext();
+                DisplayMetrics displayMetrics = new DisplayMetrics();
+                ((WindowManager) context.getApplicationContext().getSystemService(android.content.Context.WINDOW_SERVICE)).getDefaultDisplay().getMetrics(displayMetrics);
+                return displayMetrics.widthPixels + "x" + displayMetrics.heightPixels;
+            }
+        };
+    }
+
+    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
+    static Closure getDiagonal() {
+        return new Closure() {
+            @Override
+            public String execute() {
+                DisplayMetrics metrics = new DisplayMetrics();
+                Display d = ((WindowManager) Tracker.getAppContext().getSystemService(Context.WINDOW_SERVICE))
+                        .getDefaultDisplay();
+                d.getMetrics(metrics);
+
+                // since SDK_INT = 1;
+                int widthPixels = metrics.widthPixels;
+                int heightPixels = metrics.heightPixels;
+
+                try {
+                    // includes window decorations (statusbar bar/menu bar)
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH && Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1) {
+                        widthPixels = (Integer) Display.class.getMethod("getRawWidth").invoke(d);
+                        heightPixels = (Integer) Display.class.getMethod("getRawHeight").invoke(d);
+                    }
+                    // includes window decorations (statusbar bar/menu bar)
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+                        Point realSize = new Point();
+                        d.getRealSize(realSize);
+
+                        widthPixels = realSize.x;
+                        heightPixels = realSize.y;
+
+                    }
+                } catch (Exception ignored) {
+                }
+
+                double x = Math.pow(widthPixels / metrics.xdpi, 2);
+                double y = Math.pow(heightPixels / metrics.ydpi, 2);
+
+
+                return String.format(Locale.getDefault(), "%.1f", Math.sqrt(x + y));
+            }
+        };
+    }
+
+    static Closure getDownloadSource(final Tracker tracker) {
+        return new Closure() {
+            @Override
+            public String execute() {
+                Object dls = tracker.getConfiguration().get(TrackerConfigurationKeys.DOWNLOAD_SOURCE);
+                if (dls != null) {
+                    return String.valueOf(dls);
+                } else {
+                    return "ext";
+                }
+            }
+        };
+    }
+
+    static Closure getUserId(final String identifier) {
+        return new Closure() {
+            @SuppressLint("HardwareIds")
+            @Override
+            public String execute() {
+                final android.content.Context context = Tracker.getAppContext();
+                SharedPreferences preferences = context.getSharedPreferences(TrackerConfigurationKeys.PREFERENCES, Context.MODE_PRIVATE);
+
+                if (preferences.getBoolean(TrackerConfigurationKeys.DO_NOT_TRACK_ENABLED, false)) {
+                    return "opt-out";
+                } else if (identifier.equals(ANDROID_ID_KEY)) {
+                    return Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID);
+                } else if (identifier.equals(UUID_KEY)) {
+                    String uuid = preferences.getString(TrackerConfigurationKeys.IDCLIENT_UUID, null);
+                    if (uuid == null) {
+                        uuid = UUID.randomUUID().toString();
+                        preferences.edit().putString(TrackerConfigurationKeys.IDCLIENT_UUID, uuid).apply();
+                    }
+                    return uuid;
+                } else {
+                    try {
+                        com.google.android.gms.ads.identifier.AdvertisingIdClient.Info adInfo = null;
+                        int count = 0;
+                        while (adInfo == null && count < RETRY_GET_ADVERTISING_COUNT) {
+                            adInfo = com.google.android.gms.ads.identifier.AdvertisingIdClient.getAdvertisingIdInfo(context);
+                            count++;
+                        }
+                        if (adInfo != null && !adInfo.isLimitAdTrackingEnabled()) {
+                            return adInfo.getId();
+                        } else {
+                            return "opt-out";
+                        }
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                        return "";
+                    }
+                }
+            }
+        };
+    }
+
+    static void doNotTrack(android.content.Context context, boolean enabled) {
+        context.getSharedPreferences(TrackerConfigurationKeys.PREFERENCES, android.content.Context.MODE_PRIVATE).edit().putBoolean(TrackerConfigurationKeys.DO_NOT_TRACK_ENABLED, enabled).apply();
+    }
+
+    static boolean doNotTrackEnabled(android.content.Context context) {
+        return context.getSharedPreferences(TrackerConfigurationKeys.PREFERENCES, android.content.Context.MODE_PRIVATE).getBoolean(TrackerConfigurationKeys.DO_NOT_TRACK_ENABLED, false);
+    }
+}
+
+class Tool {
+
+    enum CallbackType {
+        firstLaunch, build, send, partner, warning, save, error
+    }
+
+    static String percentEncode(String s) {
+        try {
+            s = URLEncoder.encode(s, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        return s.replace("+", "%20")
+                .replace("*", "%2A")
+                .replace("-", "%2D")
+                .replace(".", "%2E")
+                .replace("_", "%5F");
+    }
+
+    static String percentDecode(String s) {
+        try {
+            s = URLDecoder.decode(s, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        return s;
+    }
+
+    static String removeCharacters(String s, String... charTobeRemoved) {
+        String result = s;
+        for (String c : charTobeRemoved) {
+            result = result.replace(c, "");
+        }
+        return result;
+    }
+
+    @SuppressWarnings("unchecked")
+    static String convertToString(Object value, String separator) {
+        separator = (!TextUtils.isEmpty(separator)) ? separator : ",";
+        String result = "";
+        boolean isFirst = true;
+
+        if (value != null) {
+            if (value instanceof List) {
+                List<Object> listResult = (List<Object>) value;
+                for (Object object : listResult) {
+                    value = object;
+                    if (isFirst) {
+                        result = convertToString(value, separator);
+                        isFirst = false;
+                    } else {
+                        result += separator + convertToString(value, separator);
+                    }
+                }
+            } else if (value instanceof Object[]) {
+                Object[] objects = (Object[]) value;
+                value = Arrays.asList(objects);
+                return convertToString(value, separator);
+            } else if (value instanceof Map) {
+                result = new JSONObject((Map) value).toString();
+            } else {
+                result = String.valueOf(value);
+            }
+        }
+
+        return result;
+    }
+
+    static ArrayList<Pair<Param, Integer>> findParametersWithPosition(String key, ArrayList<Param> parameters) {
+        ArrayList<Pair<Param, Integer>> params = new ArrayList<>();
+        int index = 0;
+        for (Param p : parameters) {
+            if (p.getKey().equals(key)) {
+                params.add(new Pair<>(p, index));
+            }
+            index++;
+        }
+
+        return params;
+    }
+
+    static Closure getTimeStamp() {
+        return new Closure() {
+            @Override
+            public String execute() {
+
+                double result = System.currentTimeMillis() / 1000.0;
+                long d = (long) result;
+                String afterZero = Double.toString(result - d);
+
+                return afterZero.length() > 1 ? Long.toString(d) + afterZero.substring(1) : "";
+            }
+        };
+    }
+
+    static boolean isTablet(android.content.Context context) {
+        return (context.getResources().getConfiguration().screenLayout & android.content.res.Configuration.SCREENLAYOUT_SIZE_MASK) >= android.content.res.Configuration.SCREENLAYOUT_SIZE_LARGE;
+    }
+
+    static Tracker.OfflineMode convertStringToOfflineMode(String offlineMode) {
+        switch (offlineMode) {
+            case "always":
+                return Tracker.OfflineMode.always;
+            case "never":
+                return Tracker.OfflineMode.never;
+            default:
+                return Tracker.OfflineMode.required;
+        }
+    }
+
+    static void executeCallback(TrackerListener trackerListener, CallbackType callbackType, String message, TrackerListener.HitStatus... hitStatuses) {
+        if (trackerListener != null) {
+            switch (callbackType) {
+                case firstLaunch:
+                    trackerListener.trackerNeedsFirstLaunchApproval(message);
+                    break;
+                case build:
+                    trackerListener.buildDidEnd(hitStatuses[0], message);
+                    break;
+                case send:
+                    trackerListener.sendDidEnd(hitStatuses[0], message);
+                    break;
+                case partner:
+                    trackerListener.didCallPartner(message);
+                    break;
+                case warning:
+                    trackerListener.warningDidOccur(message);
+                    break;
+                case save:
+                    trackerListener.saveDidEnd(message);
+                    break;
+                default://error
+                    trackerListener.errorDidOccur(message);
+                    break;
+            }
+        }
+    }
+
+    static int getDaysBetweenTimes(long latestTimeMillis, long oldestTimeMillis) {
+        return (int) TimeUnit.DAYS.convert((latestTimeMillis - oldestTimeMillis), TimeUnit.MILLISECONDS);
+    }
+
+    static int getMinutesBetweenTimes(long latestTimeMillis, long oldestTimeMillis) {
+        return (int) TimeUnit.MINUTES.convert((latestTimeMillis - oldestTimeMillis), TimeUnit.MILLISECONDS);
+    }
+
+    static int getSecondsBetweenTimes(long latestTimeMillis, long oldestTimeMillis) {
+        return (int) TimeUnit.SECONDS.convert((latestTimeMillis - oldestTimeMillis), TimeUnit.MILLISECONDS);
+    }
+
+    static String formatNumberLength(String s, int length) {
+        String result = "";
+        for (int i = s.length(); i < length; i++) {
+            result += "0";
+        }
+        return result + s;
+    }
+
+    static boolean isJSONObject(String s) {
+        try {
+            JSONObject object = new JSONObject(s);
+            return true;
+        } catch (JSONException e) {
+            return false;
+        }
+    }
+
+    static boolean isJSONArray(String s) {
+        try {
+            JSONArray array = new JSONArray(s);
+            return true;
+        } catch (JSONException e) {
+            return false;
+        }
+    }
+
+    static Map toMap(JSONObject jsonObject) {
+        Map<String, Object> map = new HashMap<>();
+
+        Iterator<String> keysItr = jsonObject.keys();
+        while (keysItr.hasNext()) {
+            String key = keysItr.next();
+            Object value = null;
+            try {
+                value = jsonObject.get(key);
+            } catch (JSONException e) {
+                e.printStackTrace();
+            }
+            map.put(key, value);
+        }
+        return map;
+    }
+
+    static Param findParameter(String key, LinkedHashMap<String, Param> volatiles, LinkedHashMap<String, Param> persistents) {
+        if (volatiles.containsKey(key)) {
+            return volatiles.get(key);
+        } else if (persistents.containsKey(key)) {
+            return persistents.get(key);
+        }
+        return null;
+    }
+
+    static String appendParameterValues(Param param) {
+        boolean isFirst = true;
+        StringBuilder result = new StringBuilder();
+
+        if (param == null) {
+            return result.toString();
+        }
+        for (Closure closure : param.getValues()) {
+            if (isFirst) {
+                result.append(closure.execute());
+                isFirst = false;
+            } else {
+                if (param.getOptions() != null) {
+                    result.append(param.getOptions().getSeparator());
+                } else {
+                    result.append(",");
+                }
+                result.append(closure.execute());
+            }
+        }
+
+        return result.toString();
+    }
+
+    static String SHA_256(String s) {
+        String baseString = "AT" + s;
+        String result = "";
+        try {
+            MessageDigest md;
+            md = MessageDigest.getInstance("SHA-256");
+            md.update(baseString.getBytes());
+
+            byte byteData[] = md.digest();
+
+            for (byte aByteData : byteData) {
+                String hex = Integer.toHexString(0xff & aByteData);
+                if (hex.length() == 1) {
+                    result += "0";
+                }
+                result += hex;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+    static Drawable getResizedImage(int imageID, android.content.Context context, int width, int height) {
+        Bitmap b = BitmapFactory.decodeResource(context.getResources(), imageID);
+        Bitmap bitmapResized = Bitmap.createScaledBitmap(b, width, height, false);
+        return new BitmapDrawable(context.getResources(), bitmapResized);
+    }
+
+    static void setVisibleViewWithAnimation(View view, boolean visible) {
+        AlphaAnimation animation;
+        if (visible) {
+            view.setVisibility(View.VISIBLE);
+            animation = new AlphaAnimation(0.f, 1.f);
+        } else {
+            view.setVisibility(View.GONE);
+            animation = new AlphaAnimation(1.f, 0.f);
+        }
+        animation.setDuration(400);
+        view.startAnimation(animation);
+    }
+
+    static LinkedHashMap<String, String> getParameters(String hit) {
+        LinkedHashMap<String, String> map = new LinkedHashMap<>();
+        try {
+            URL url = new URL(hit);
+            map.put("ssl", url.getProtocol().equals("http") ? "Off" : "On");
+            map.put("log", url.getHost());
+            String[] queryComponents = url.getQuery().split("&");
+            for (String queryComponent : queryComponents) {
+                String[] elem = queryComponent.split("=");
+                if (elem.length > 1) {
+                    elem[1] = Tool.percentDecode(elem[1]);
+                    if (Tool.isJSONObject(elem[1])) {
+                        JSONObject json = new JSONObject(elem[1]);
+                        if (elem[0].equals(Hit.HitParam.JSON.stringValue())) {
+                            map.put(elem[0], json.toString(3));
+                        } else {
+                            map.put(elem[0], elem[1]);
+                        }
+                    } else {
+                        map.put(elem[0], elem[1]);
+                    }
+                } else {
+                    map.put(elem[0], "");
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return map;
+    }
+
+    @SuppressWarnings("deprecation")
+    @SuppressLint("deprecation")
+    @TargetApi(Build.VERSION_CODES.M)
+    static int getColor(android.content.Context context, int colorId) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            return context.getResources().getColor(colorId, null);
+        } else {
+            return context.getResources().getColor(colorId);
+        }
+    }
+
+    static void runOnMainThread(Activity act, Runnable r) {
+        if (Looper.myLooper() == Looper.getMainLooper()) {
+            r.run();
+        } else {
+            act.runOnUiThread(r);
+        }
+    }
+}
+
+class Storage extends SQLiteOpenHelper {
+
+    private static final int DATABASE_VERSION = 1;
+    private static final String DATABASE_NAME = "TrackerDatabase";
+    private static final String HITS_STORAGE_TABLE = "StoredOfflineHit";
+    private static final String ID = "id";
+    private static final String HIT = "hit";
+    private static final String RETRY = "retry";
+    private static final String DATE = "date";
+    private static final String CREATE_TABLE_QUERY =
+            "CREATE TABLE IF NOT EXISTS " + HITS_STORAGE_TABLE + " (" +
+                    ID + " INTEGER PRIMARY KEY AUTOINCREMENT , " +
+                    HIT + " TEXT NOT NULL , " +
+                    DATE + " INTEGER NOT NULL , " +
+                    RETRY + " INTEGER NOT NULL);";
+
+    private Tracker.OfflineMode offlineMode;
+
+    Tracker.OfflineMode getOfflineMode() {
+        return offlineMode;
+    }
+
+    void setOfflineMode(Tracker.OfflineMode offlineMode) {
+        this.offlineMode = offlineMode;
+    }
+
+    Storage(Context context) {
+        super(context, DATABASE_NAME, null, DATABASE_VERSION);
+        this.offlineMode = Tracker.OfflineMode.required;
+    }
+
+    @Override
+    public void onCreate(SQLiteDatabase db) {
+        db.execSQL(CREATE_TABLE_QUERY);
+    }
+
+    @Override
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        db.execSQL("DROP TABLE IF EXISTS " + HITS_STORAGE_TABLE);
+        onCreate(db);
+    }
+
+    String saveHit(String hit, long time, String oltParameter) {
+        hit = buildHitToStore(hit, oltParameter);
+        ContentValues values = new ContentValues();
+        values.put(HIT, hit);
+        values.put(RETRY, 0);
+        values.put(DATE, time);
+        SQLiteDatabase db = getWritableDatabase();
+        db.insert(HITS_STORAGE_TABLE, null, values);
+        db.close();
+        return hit;
+    }
+
+    void deleteHit(String hit) {
+        SQLiteDatabase db = getWritableDatabase();
+        db.delete(HITS_STORAGE_TABLE, HIT + "='" + hit + "'", null);
+        db.close();
+    }
+
+    String buildHitToStore(String hit, String olt) {
+        String[] hitComponents = hit.split("&");
+        String newHit = hitComponents[0];
+
+        for (int i = 1; i < hitComponents.length; i++) {
+            String[] parameterComponents = hitComponents[i].split("=");
+
+            if (parameterComponents[0].equals("cn")) {
+                newHit += "&cn=offline";
+            } else {
+                newHit += "&" + hitComponents[i];
+            }
+
+            if (parameterComponents[0].equals("ts") || parameterComponents[0].equals("mh")) {
+                newHit += "&olt=" + olt;
+            }
+        }
+        return newHit;
+    }
+
+    void updateRetry(String hit, int retry) {
+        ContentValues values = new ContentValues();
+        values.put(RETRY, retry);
+        SQLiteDatabase db = getWritableDatabase();
+        db.update(HITS_STORAGE_TABLE, values, HIT + "='" + hit + "'", null);
+        db.close();
+    }
+
+    int getCountOfflineHits() {
+        int result = -1;
+        SQLiteDatabase db = getReadableDatabase();
+        Cursor c = db.rawQuery("SELECT * FROM " + HITS_STORAGE_TABLE, null);
+        if (c != null) {
+            result = c.getCount();
+            c.close();
+        }
+        db.close();
+        return result;
+    }
+
+    void removeAllOfflineHits() {
+        SQLiteDatabase db = getWritableDatabase();
+        db.delete(HITS_STORAGE_TABLE, null, null);
+        db.close();
+    }
+
+    void removeOldOfflineHits(int storageDuration) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(new Date());
+        cal.add(Calendar.DATE, -storageDuration);
+        long maxOldDate = cal.getTime().getTime();
+        SQLiteDatabase db = getWritableDatabase();
+        db.delete(HITS_STORAGE_TABLE, DATE + " < " + maxOldDate, null);
+        db.close();
+    }
+
+    ArrayList<Hit> getOfflineHits() {
+        ArrayList<Hit> hits = new ArrayList<>();
+        SQLiteDatabase db = getReadableDatabase();
+        Cursor c = db.rawQuery("SELECT * FROM " + HITS_STORAGE_TABLE + " ORDER BY " + ID + " ASC", null);
+        if (c != null && c.getCount() > 0) {
+            c.moveToFirst();
+            do {
+                String hit = c.getString(c.getColumnIndex(HIT));
+                String time = c.getString(c.getColumnIndex(DATE));
+                int retry = c.getInt(c.getColumnIndex(RETRY));
+                hits.add(new Hit(hit, new Date(Long.parseLong(time)), retry, true));
+            }
+            while (c.moveToNext());
+            c.close();
+        }
+        db.close();
+        return hits;
+    }
+
+    Hit getOldestOfflineHit() {
+        SQLiteDatabase db = getReadableDatabase();
+        Cursor c = db.rawQuery("SELECT * FROM " + HITS_STORAGE_TABLE + " WHERE " + DATE + " = (SELECT MIN(" + DATE + ") FROM " + HITS_STORAGE_TABLE + " )", null);
+        if (c != null && c.moveToFirst()) {
+            String hit = c.getString(c.getColumnIndex(HIT));
+            String time = c.getString(c.getColumnIndex(DATE));
+            int retry = c.getInt(c.getColumnIndex(RETRY));
+            if (hit != null && time != null) {
+                c.close();
+                db.close();
+                return new Hit(hit, new Date(Long.parseLong(time)), retry, true);
+            }
+            c.close();
+        }
+        db.close();
+        return null;
+    }
+
+    Hit getLatestOfflineHit() {
+        SQLiteDatabase db = getReadableDatabase();
+        Cursor c = db.rawQuery("SELECT * FROM " + HITS_STORAGE_TABLE + " WHERE " + DATE + " = (SELECT MAX(" + DATE + ") FROM " + HITS_STORAGE_TABLE + " )", null);
+        if (c != null && c.moveToFirst()) {
+            String hit = c.getString(c.getColumnIndex(HIT));
+            String time = c.getString(c.getColumnIndex(DATE));
+            int retry = c.getInt(c.getColumnIndex(RETRY));
+            if (hit != null && time != null) {
+                c.close();
+                db.close();
+                return new Hit(hit, new Date(Long.parseLong(time)), retry, true);
+            }
+            c.close();
+        }
+        db.close();
+        return null;
+    }
+}
+
+class Lists {
+
+    static HashMap<String, Hit.HitType> getProcessedTypes() {
+        return new HashMap<String, Hit.HitType>() {{
+            put("audio", Hit.HitType.Audio);
+            put("video", Hit.HitType.Video);
+            put("vpre", Hit.HitType.Video);
+            put("vmid", Hit.HitType.Video);
+            put("vpost", Hit.HitType.Video);
+            put("animation", Hit.HitType.Animation);
+            put("anim", Hit.HitType.Animation);
+            put("podcast", Hit.HitType.PodCast);
+            put("rss", Hit.HitType.RSS);
+            put("email", Hit.HitType.Email);
+            put("pub", Hit.HitType.Publicite);
+            put("ad", Hit.HitType.Publicite);
+            put("click", Hit.HitType.Touch);
+            put("clic", Hit.HitType.Touch);
+            put("AT", Hit.HitType.AdTracking);
+            put("pdt", Hit.HitType.ProduitImpression);
+            put("mvt", Hit.HitType.MvTesting);
+            put("wbo", Hit.HitType.Weborama);
+            put("screen", Hit.HitType.Screen);
+        }};
+    }
+
+    static HashSet<String> getReadOnlyConfigs() {
+        return new HashSet<String>() {{
+        }};
+    }
+
+    static HashSet<String> getReadOnlyParams() {
+        return new HashSet<String>() {{
+            add("vtag");
+            add("ptag");
+            add("lng");
+            add("mfmd");
+            add("os");
+            add("apvr");
+            add("hl");
+            add("r");
+            add("car");
+            add("cn");
+            add("ts");
+        }};
+    }
+
+    static HashSet<String> getAvailablePluginsParamKey() {
+        return new HashSet<String>() {{
+            add(Hit.HitParam.TVT.stringValue());
+        }};
+    }
+
+    static HashSet<String> getSliceReadyParams() {
+        return new HashSet<String>() {{
+            add("ati");
+            add("atc");
+            add("pdtl");
+            add("stc");
+        }};
+    }
+}
\ No newline at end of file
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/LifeCycle.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/CoreFeatures.java
similarity index 60%
rename from ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/LifeCycle.java
rename to ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/CoreFeatures.java
index 5ac15d50..df493a33 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/LifeCycle.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/CoreFeatures.java
@@ -22,9 +22,14 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
+import android.annotation.TargetApi;
+import android.app.Activity;
+import android.app.Application;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.os.Handler;
 import android.text.TextUtils;
 
 import org.json.JSONException;
@@ -37,6 +42,130 @@ of this software and associated documentation files (the "Software"), to deal
 import java.util.Locale;
 import java.util.UUID;
 
+class CrashDetectionHandler implements Thread.UncaughtExceptionHandler {
+
+    /**
+     * Key representing if the app crashed or not
+     */
+    private static final String CRASH_DETECTION = "CrashDetection";
+
+    /**
+     * Key representing the last track screen before crash
+     */
+    private static final String CRASH_LAST_SCREEN = "CrashLastScreen";
+
+    /**
+     * Key representing where the app crashed
+     */
+    private static final String CRASH_CLASS_CAUSE = "CrashClassCause";
+
+    /**
+     * Key representing why the app crashed
+     */
+    private static final String CRASH_EXCEPTION_NAME = "CrashExceptionName";
+
+    /**
+     * Default Handler to show dialog
+     */
+    private final Thread.UncaughtExceptionHandler defaultHandler;
+
+    /**
+     * Context
+     */
+    private final Context context;
+
+    /**
+     * Shared preferences
+     */
+    private static SharedPreferences preferences;
+
+    /**
+     * Last Track Screen
+     */
+    private static String lastScreen;
+
+    /**
+     * Set the last screen name
+     *
+     * @param name String
+     */
+    static void setCrashLastScreen(String name) {
+        lastScreen = name;
+    }
+
+
+    /**
+     * Default constructor
+     *
+     * @param context        Context
+     * @param defaultHandler Thread.UncaughtExceptionHandler
+     */
+    CrashDetectionHandler(Context context, Thread.UncaughtExceptionHandler defaultHandler) {
+        this.defaultHandler = defaultHandler;
+        this.context = context;
+        preferences = context.getApplicationContext().getSharedPreferences(TrackerConfigurationKeys.PREFERENCES, Context.MODE_PRIVATE);
+    }
+
+    @Override
+    public void uncaughtException(Thread thread, Throwable throwable) {
+        String className = (throwable.getCause() != null) ? getClassNameException(throwable.getCause()) : getClassNameException(throwable);
+        String exceptionName = (throwable.getCause() != null) ? throwable.getCause().getClass().getName() : throwable.getClass().getName();
+
+        preferences.edit().putBoolean(CRASH_DETECTION, true)
+                .putString(CRASH_LAST_SCREEN, lastScreen != null ? lastScreen : "")
+                .putString(CRASH_CLASS_CAUSE, className)
+                .putString(CRASH_EXCEPTION_NAME, exceptionName != null ? exceptionName : "")
+                .apply();
+        defaultHandler.uncaughtException(thread, throwable);
+    }
+
+    /**
+     * Get a dictionary className : stackTrace
+     *
+     * @return Closure
+     */
+    static Closure getCrashInformation() {
+        return new Closure() {
+            @Override
+            public String execute() {
+                boolean hasCrashed = preferences.getBoolean(CRASH_DETECTION, false);
+                if (hasCrashed) {
+                    final String lastScreen = preferences.getString(CRASH_LAST_SCREEN, "");
+                    final String className = preferences.getString(CRASH_CLASS_CAUSE, "");
+                    final String exceptionName = preferences.getString(CRASH_EXCEPTION_NAME, "");
+                    LinkedHashMap<String, String> map = new LinkedHashMap<String, String>() {{
+                        put("lastscreen", lastScreen);
+                        put("classname", className);
+                        put("error", exceptionName);
+                    }};
+                    preferences.edit().putBoolean(CRASH_DETECTION, false).apply();
+                    try {
+                        return new JSONObject().put("crash", new JSONObject(map)).toString();
+                    } catch (JSONException e) {
+                        e.printStackTrace();
+                    }
+                }
+                return new JSONObject().toString();
+            }
+        };
+    }
+
+    /**
+     * Get the class name where the exception thrown
+     *
+     * @param t Throwable
+     * @return String
+     */
+    private String getClassNameException(Throwable t) {
+        for (StackTraceElement element : t.getStackTrace()) {
+            if (element.getClassName().contains(context.getApplicationContext().getPackageName())) {
+                return element.getClassName();
+            }
+        }
+        return "";
+    }
+}
+
 class LifeCycle {
 
     /**
@@ -267,3 +396,86 @@ public String execute() {
         };
     }
 }
+
+@TargetApi(android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH)
+class TrackerActivityLifeCycle implements Application.ActivityLifecycleCallbacks {
+
+    protected static final int DELAY = 300;
+    static final int DELTA = 2;
+
+    protected long timeInBackground;
+    protected final Configuration configuration;
+    protected String savedActivityName;
+    protected int savedActivityTaskId;
+    private Handler handler;
+    private Runnable debuggerCancelable;
+
+    TrackerActivityLifeCycle(Configuration configuration) {
+        this.configuration = configuration;
+        timeInBackground = -1;
+        savedActivityName = null;
+        handler = new Handler();
+        debuggerCancelable = new Runnable() {
+            @Override
+            public void run() {
+                Debugger.setViewerVisibility(false);
+                Debugger.setDebuggerViewerLayout(false);
+            }
+        };
+    }
+
+    @Override
+    public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
+        TechnicalContext.screenName = null;
+        TechnicalContext.level2 = 0;
+        if (savedActivityName == null || activity == null || !activity.getClass().getCanonicalName().equals(savedActivityName)
+                || activity.getTaskId() == savedActivityTaskId) {
+            timeInBackground = -1;
+        }
+    }
+
+    @Override
+    public void onActivityStarted(Activity activity) {
+        if (timeInBackground > -1) {
+            int sessionBackgroundDuration = Integer.parseInt(String.valueOf(configuration.get(TrackerConfigurationKeys.SESSION_BACKGROUND_DURATION)));
+            if (Tool.getSecondsBetweenTimes(System.currentTimeMillis(), timeInBackground) >= (sessionBackgroundDuration < DELTA ? DELTA : sessionBackgroundDuration)) {
+                LifeCycle.newSessionInit(Tracker.getPreferences());
+                timeInBackground = -1;
+            }
+        }
+    }
+
+    @Override
+    public void onActivityResumed(Activity activity) {
+        if (Debugger.isActive) {
+            handler.removeCallbacks(debuggerCancelable);
+            Debugger.setViewerVisibility(true);
+        }
+    }
+
+    @Override
+    public void onActivityPaused(Activity activity) {
+        savedActivityName = activity.getClass().getCanonicalName();
+        savedActivityTaskId = activity.getTaskId();
+        timeInBackground = System.currentTimeMillis();
+        if (Debugger.isActive) {
+            handler.postDelayed(debuggerCancelable, DELAY);
+        }
+    }
+
+    @Override
+    public void onActivityStopped(Activity activity) {
+        // Required by interface
+    }
+
+    @Override
+    public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
+        // Required by interface
+    }
+
+    @Override
+    public void onActivityDestroyed(Activity activity) {
+        // Required by interface
+    }
+}
+
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/CrashDetectionHandler.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/CrashDetectionHandler.java
deleted file mode 100644
index 16932219..00000000
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/CrashDetectionHandler.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
-This SDK is licensed under the MIT license (MIT)
-Copyright (c) 2015- Applied Technologies Internet SAS (registration number B 403 261 258 - Trade and Companies Register of Bordeaux – France)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
- */
-package com.atinternet.tracker;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.LinkedHashMap;
-
-class CrashDetectionHandler implements Thread.UncaughtExceptionHandler {
-
-    /**
-     * Key representing if the app crashed or not
-     */
-    private static final String CRASH_DETECTION = "CrashDetection";
-
-    /**
-     * Key representing the last track screen before crash
-     */
-    private static final String CRASH_LAST_SCREEN = "CrashLastScreen";
-
-    /**
-     * Key representing where the app crashed
-     */
-    private static final String CRASH_CLASS_CAUSE = "CrashClassCause";
-
-    /**
-     * Key representing why the app crashed
-     */
-    private static final String CRASH_EXCEPTION_NAME = "CrashExceptionName";
-
-    /**
-     * Default Handler to show dialog
-     */
-    private final Thread.UncaughtExceptionHandler defaultHandler;
-
-    /**
-     * Context
-     */
-    private final Context context;
-
-    /**
-     * Shared preferences
-     */
-    private static SharedPreferences preferences;
-
-    /**
-     * Last Track Screen
-     */
-    private static String lastScreen;
-
-    /**
-     * Set the last screen name
-     *
-     * @param name String
-     */
-    static void setCrashLastScreen(String name) {
-        lastScreen = name;
-    }
-
-
-    /**
-     * Default constructor
-     *
-     * @param context        Context
-     * @param defaultHandler Thread.UncaughtExceptionHandler
-     */
-    public CrashDetectionHandler(Context context, Thread.UncaughtExceptionHandler defaultHandler) {
-        this.defaultHandler = defaultHandler;
-        this.context = context;
-        preferences = context.getApplicationContext().getSharedPreferences(TrackerConfigurationKeys.PREFERENCES, Context.MODE_PRIVATE);
-    }
-
-    @Override
-    public void uncaughtException(Thread thread, Throwable throwable) {
-        String className = (throwable.getCause() != null) ? getClassNameException(throwable.getCause()) : getClassNameException(throwable);
-        String exceptionName = (throwable.getCause() != null) ? throwable.getCause().getClass().getName() : throwable.getClass().getName();
-
-        preferences.edit().putBoolean(CRASH_DETECTION, true)
-                .putString(CRASH_LAST_SCREEN, lastScreen != null ? lastScreen : "")
-                .putString(CRASH_CLASS_CAUSE, className)
-                .putString(CRASH_EXCEPTION_NAME, exceptionName != null ? exceptionName : "")
-                .apply();
-        defaultHandler.uncaughtException(thread, throwable);
-    }
-
-    /**
-     * Get a dictionary className : stackTrace
-     *
-     * @return Closure
-     */
-    public static Closure getCrashInformation() {
-        return new Closure() {
-            @Override
-            public String execute() {
-                boolean hasCrashed = preferences.getBoolean(CRASH_DETECTION, false);
-                if (hasCrashed) {
-                    final String lastScreen = preferences.getString(CRASH_LAST_SCREEN, "");
-                    final String className = preferences.getString(CRASH_CLASS_CAUSE, "");
-                    final String exceptionName = preferences.getString(CRASH_EXCEPTION_NAME, "");
-                    LinkedHashMap<String, String> map = new LinkedHashMap<String, String>() {{
-                        put("lastscreen", lastScreen);
-                        put("classname", className);
-                        put("error", exceptionName);
-                    }};
-                    preferences.edit().putBoolean(CRASH_DETECTION, false).apply();
-                    try {
-                        return new JSONObject().put("crash", new JSONObject(map)).toString();
-                    } catch (JSONException e) {
-                        e.printStackTrace();
-                    }
-                }
-                return new JSONObject().toString();
-            }
-        };
-    }
-
-    /**
-     * Get the class name where the exception thrown
-     *
-     * @param t Throwable
-     * @return String
-     */
-    private String getClassNameException(Throwable t) {
-        for (StackTraceElement element : t.getStackTrace()) {
-            if (element.getClassName().contains(context.getApplicationContext().getPackageName())) {
-                return element.getClassName();
-            }
-        }
-        return "";
-    }
-}
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/CustomObject.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/CustomObject.java
index 11961f7e..669e434d 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/CustomObject.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/CustomObject.java
@@ -26,21 +26,27 @@ of this software and associated documentation files (the "Software"), to deal
 
 import java.util.Map;
 
+/**
+ * Wrapper class to inject custom data in tracking
+ */
 public class CustomObject extends BusinessObject {
 
     private String value;
+    private boolean isPersistent;
+
+    CustomObject setValue(String value) {
+        this.value = value;
+        return this;
+    }
 
     /**
-     * Get the customObject value
+     * Specify if CustomObject have to be permanent
      *
-     * @return String
+     * @param persistent /
+     * @return CustomObject instance
      */
-    public String getValue() {
-        return value;
-    }
-
-    CustomObject setValue(String value) {
-        this.value = value;
+    public CustomObject setPersistent(boolean persistent) {
+        this.isPersistent = persistent;
         return this;
     }
 
@@ -58,8 +64,17 @@ CustomObject setValue(String value) {
         value = new JSONObject().toString();
     }
 
+    /**
+     * Get the custom object value
+     *
+     * @return the custom data as string - json formatted
+     */
+    public String getValue() {
+        return value;
+    }
+
     @Override
     void setEvent() {
-        tracker.setParam(Hit.HitParam.JSON.stringValue(), value, new ParamOption().setAppend(true).setEncode(true));
+        tracker.setParam(Hit.HitParam.JSON.stringValue(), value, new ParamOption().setAppend(true).setEncode(true).setPersistent(isPersistent));
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/CustomObjects.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/CustomObjects.java
index b9660f2b..742ee1c4 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/CustomObjects.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/CustomObjects.java
@@ -28,6 +28,9 @@ of this software and associated documentation files (the "Software"), to deal
 import java.util.List;
 import java.util.Map;
 
+/**
+ * Wrapper class to manage CustomObject instances
+ */
 public class CustomObjects extends Helper {
 
     private AbstractScreen screen;
@@ -72,8 +75,8 @@ public class CustomObjects extends Helper {
     /**
      * Add a CustomObject
      *
-     * @param customObject String
-     * @return CustomObject
+     * @param customObject json string value
+     * @return a CustomObject instance
      */
     public CustomObject add(String customObject) {
         CustomObject obj = new CustomObject(tracker).setValue(customObject);
@@ -98,8 +101,8 @@ public CustomObject add(String customObject) {
     /**
      * Add a CustomObject
      *
-     * @param customObject Map
-     * @return CustomObject
+     * @param customObject map with custom data
+     * @return a CustomObject instance
      */
     public CustomObject add(Map<String, Object> customObject) {
         return add(new JSONObject(customObject).toString());
@@ -108,7 +111,7 @@ public CustomObject add(Map<String, Object> customObject) {
     /**
      * Remove a CustomObject
      *
-     * @param customObjectId String
+     * @param customObjectId business object identifier
      */
     public void remove(String customObjectId) {
         if (screen != null) {
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/CustomTreeStructure.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/CustomTreeStructure.java
index 45a2f058..b404eda5 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/CustomTreeStructure.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/CustomTreeStructure.java
@@ -22,19 +22,28 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
+/**
+ * Wrapper class for custom tree structure tracking
+ */
 public class CustomTreeStructure extends ScreenInfo {
 
     private static final String CUSTOM_TREE_FORMAT = "%1$s-%2$s-%3$s";
 
-
     private int category1;
     private int category2;
     private int category3;
 
+    CustomTreeStructure(Tracker tracker) {
+        super(tracker);
+        category1 = 0;
+        category2 = 0;
+        category3 = 0;
+    }
+
     /**
      * Get the first category
      *
-     * @return int
+     * @return the first category
      */
     public int getCategory1() {
         return category1;
@@ -43,7 +52,7 @@ public int getCategory1() {
     /**
      * Get the second category
      *
-     * @return int
+     * @return the second category
      */
     public int getCategory2() {
         return category2;
@@ -52,7 +61,7 @@ public int getCategory2() {
     /**
      * Get the third category
      *
-     * @return int
+     * @return the third category
      */
     public int getCategory3() {
         return category3;
@@ -61,8 +70,8 @@ public int getCategory3() {
     /**
      * Set a new first category
      *
-     * @param category1 int
-     * @return CustomTreeStructure
+     * @param category1 /
+     * @return the CustomTreeStructure instance
      */
     public CustomTreeStructure setCategory1(int category1) {
         this.category1 = category1;
@@ -72,8 +81,8 @@ public CustomTreeStructure setCategory1(int category1) {
     /**
      * Set a new second category
      *
-     * @param category2 int
-     * @return CustomTreeStructure
+     * @param category2 /
+     * @return the CustomTreeStructure instance
      */
     public CustomTreeStructure setCategory2(int category2) {
         this.category2 = category2;
@@ -83,21 +92,14 @@ public CustomTreeStructure setCategory2(int category2) {
     /**
      * Set a new third category
      *
-     * @param category3 int
-     * @return CustomTreeStructure
+     * @param category3 /
+     * @return the CustomTreeStructure instance
      */
     public CustomTreeStructure setCategory3(int category3) {
         this.category3 = category3;
         return this;
     }
 
-    CustomTreeStructure(Tracker tracker) {
-        super(tracker);
-        category1 = 0;
-        category2 = 0;
-        category3 = 0;
-    }
-
     @Override
     void setEvent() {
         tracker.setParam(Hit.HitParam.CustomTreeStructure.stringValue(), String.format(CUSTOM_TREE_FORMAT, category1, category2, category3));
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/CustomTreeStructures.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/CustomTreeStructures.java
index 87c7c06a..fba4e27d 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/CustomTreeStructures.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/CustomTreeStructures.java
@@ -23,6 +23,8 @@ of this software and associated documentation files (the "Software"), to deal
 package com.atinternet.tracker;
 
 /**
+ * Wrapper class to manage CustomTreeStructure instances
+ *
  * @deprecated Since 2.3.0, CustomTreeStructure is now only available as a screen object property.
  */
 @Deprecated
@@ -35,8 +37,8 @@ public class CustomTreeStructures extends Helper {
     /**
      * Add a custom tree structure
      *
-     * @param category1 int
-     * @return CustomTreeStructure
+     * @param category1 first custom tree structure category
+     * @return a CustomTreeStructure instance
      */
     public CustomTreeStructure add(int category1) {
         CustomTreeStructure customTreeStructure = new CustomTreeStructure(tracker).setCategory1(category1);
@@ -48,9 +50,9 @@ public CustomTreeStructure add(int category1) {
     /**
      * Add a custom tree structure
      *
-     * @param category1 int
-     * @param category2 int
-     * @return CustomTreeStructure
+     * @param category1 first custom tree structure category
+     * @param category2 second custom tree structure category
+     * @return a CustomTreeStructure instance
      */
     public CustomTreeStructure add(int category1, int category2) {
         return add(category1).setCategory2(category2);
@@ -59,10 +61,10 @@ public CustomTreeStructure add(int category1, int category2) {
     /**
      * Add a custom tree structure
      *
-     * @param category1 int
-     * @param category2 int
-     * @param category3 int
-     * @return CustomTreeStructure
+     * @param category1 first custom tree structure category
+     * @param category2 second custom tree structure category
+     * @param category3 third custom tree structure category
+     * @return a CustomTreeStructure instance
      */
     public CustomTreeStructure add(int category1, int category2, int category3) {
         return add(category1, category2).setCategory3(category3);
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/CustomVar.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/CustomVar.java
index 7c818831..29a57d9e 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/CustomVar.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/CustomVar.java
@@ -22,13 +22,22 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
+/**
+ * Wrapper class to inject custom variables
+ */
 public class CustomVar extends ScreenInfo {
 
     /**
      * Enum with different CustomVarType
      */
     public enum CustomVarType {
+        /**
+         * App custom var
+         */
         App("x"),
+        /**
+         * Screen custom var
+         */
         Screen("f");
 
         private final String str;
@@ -46,33 +55,6 @@ public String stringValue() {
     private CustomVarType customVarType;
     private int varId;
 
-    /**
-     * Get the customVar id
-     *
-     * @return int
-     */
-    public int getVarId() {
-        return varId;
-    }
-
-    /**
-     * Get the customVar value
-     *
-     * @return String
-     */
-    public String getValue() {
-        return value;
-    }
-
-    /**
-     * Get the customVar type
-     *
-     * @return CustomVar.CustomVarType
-     */
-    public CustomVarType getCustomVarType() {
-        return customVarType;
-    }
-
     CustomVar setVarId(int varId) {
         this.varId = varId;
         return this;
@@ -97,6 +79,32 @@ CustomVar setCustomVarType(CustomVarType customVarType) {
         value = "";
     }
 
+    /**
+     * Get the custom variable identifier
+     *
+     * @return the custom variable identifier
+     */
+    public int getVarId() {
+        return varId;
+    }
+
+    /**
+     * Get the custom variable value
+     *
+     * @return the custom variable value
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * Get the custom variable type
+     *
+     * @return the custom variable type
+     */
+    public CustomVarType getCustomVarType() {
+        return customVarType;
+    }
 
     @Override
     void setEvent() {
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/CustomVars.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/CustomVars.java
index 2da73951..ef573b02 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/CustomVars.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/CustomVars.java
@@ -26,6 +26,9 @@ of this software and associated documentation files (the "Software"), to deal
 import java.util.List;
 import java.util.Map;
 
+/**
+ * Wrapper class to manage CustomVar instances
+ */
 public class CustomVars extends Helper {
 
     private AbstractScreen screen;
@@ -40,12 +43,12 @@ public class CustomVars extends Helper {
     }
 
     /**
-     * Add a custom var
+     * Add a custom variable
      *
-     * @param varId         int
-     * @param value         String
-     * @param customVarType CustomVar.CustomVarType
-     * @return CustomVar
+     * @param varId         custom variable identifier
+     * @param value         custom variable value
+     * @param customVarType custom variable type
+     * @return a new CustomVar instance
      */
     public CustomVar add(int varId, String value, CustomVar.CustomVarType customVarType) {
         CustomVar customVar = new CustomVar(tracker)
@@ -76,7 +79,7 @@ public void remove(String customVarId) {
     }
 
     /**
-     * Remove all CustomObject
+     * Remove all CustomVars
      */
     public void removeAll() {
         if (screen != null) {
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Debugger.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Debugger.java
index bf4a00b4..fc534ce1 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Debugger.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Debugger.java
@@ -41,7 +41,6 @@ of this software and associated documentation files (the "Software"), to deal
 import android.view.animation.AlphaAnimation;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
-import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
@@ -60,6 +59,9 @@ of this software and associated documentation files (the "Software"), to deal
 import static android.view.View.OnClickListener;
 import static android.view.View.VISIBLE;
 
+/**
+ * Class to manage Debugger feature
+ */
 public class Debugger extends GestureDetector.SimpleOnGestureListener implements OnClickListener, View.OnTouchListener, AdapterView.OnItemClickListener {
 
     private static int viewerVisibility = View.GONE;
@@ -67,6 +69,7 @@ public class Debugger extends GestureDetector.SimpleOnGestureListener implements
     private static final float ALPHA_BACKGROUND = .3f;
     private static final float DELTA = 100;
 
+    static boolean isActive;
     static int currentViewVisibleId = -1;
     private static int itemPosition = -1;
     private static final ArrayList<Debugger.DebuggerEvent> debuggerEvents = new ArrayList<>();
@@ -74,7 +77,7 @@ public class Debugger extends GestureDetector.SimpleOnGestureListener implements
 
     private static WeakReference<android.content.Context> context;
     private static WeakReference<DebuggerEventListAdapter> debuggerEventListAdapter;
-    private static WeakReference<FrameLayout> debuggerViewerLayout;
+    private static WeakReference<ATFrameLayout> debuggerViewerLayout;
     private boolean hasMoved;
 
     private final Tracker tracker;
@@ -89,7 +92,7 @@ public class Debugger extends GestureDetector.SimpleOnGestureListener implements
     private RelativeLayout noOfflineHitsLayout;
     private ListView eventListView;
     private ListView offlineHitsListView;
-    private static WeakReference<ImageView> bubbleImage;
+    private static WeakReference<ATImageView> bubbleImage;
 
     private final DebuggerOfflineHitsAdapter debuggerOfflineHitsAdapter;
 
@@ -111,8 +114,8 @@ static Context getContext() {
     /**
      * Show the debugger
      *
-     * @param context Context
-     * @param tracker Tracker
+     * @param context current Activity context
+     * @param tracker tracker instance
      * @deprecated Since 2.2.2, use {@link #create(Context, Tracker)} instead.
      */
     @Deprecated
@@ -123,8 +126,8 @@ public static void show(Context context, Tracker tracker) {
     /**
      * Show the debugger
      *
-     * @param context Context
-     * @param tracker Tracker
+     * @param context current Activity context
+     * @param tracker tracker instance
      */
     public static void create(Context context, Tracker tracker) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
@@ -157,11 +160,17 @@ public static void remove() {
     /**
      * Change debugger visibility
      *
-     * @param visible boolean
+     * @param visible true if debugger should be visible
      */
     public static void setViewerVisibility(boolean visible) {
         bubbleVisibility = visible ? VISIBLE : GONE;
-        Tool.setVisibleViewWithAnimation(bubbleImage.get(), visible);
+        bubbleImage.get().setVisibility(bubbleVisibility);
+    }
+
+    static void setDebuggerViewerLayout(boolean visible) {
+        viewerVisibility = visible ? VISIBLE : GONE;
+        debuggerViewerLayout.get().setVisibility(viewerVisibility);
+        setAlphaBackground(visible, false);
     }
 
     static DebuggerEventListAdapter getDebuggerEventListAdapter() {
@@ -173,6 +182,7 @@ static ArrayList<Debugger.DebuggerEvent> getDebuggerEvents() {
     }
 
     private Debugger(Context ctx, Tracker tr) {
+        isActive = true;
         context = new WeakReference<>(ctx);
         remove();
         if (context.get().getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
@@ -286,12 +296,6 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
         onUpdateAfterItemClick(position, true);
     }
 
-    /**
-     * Callback call after onItemClick
-     *
-     * @param position int
-     * @param animate  boolean
-     */
     private void onUpdateAfterItemClick(int position, boolean animate) {
         ViewGroup parametersListView = (ViewGroup) hitDetailViewer.findViewById(R.id.parametersListView);
         if (currentViewVisibleId == R.id.eventViewer) {
@@ -317,13 +321,8 @@ private void onUpdateAfterItemClick(int position, boolean animate) {
         }
     }
 
-    /**
-     * Inflate views
-     *
-     * @param context Context
-     */
     private void inflateViews(Context context) {
-        debuggerViewerLayout = new WeakReference<>((FrameLayout) View.inflate(context, R.layout.debugger_layout, null));
+        debuggerViewerLayout = new WeakReference<>((ATFrameLayout) View.inflate(context, R.layout.debugger_layout, null));
 
         eventViewer = (LinearLayout) debuggerViewerLayout.get().findViewById(R.id.eventViewer);
         offlineViewer = (LinearLayout) debuggerViewerLayout.get().findViewById(R.id.offlineViewer);
@@ -333,7 +332,7 @@ private void inflateViews(Context context) {
         noOfflineHitsLayout = (RelativeLayout) debuggerViewerLayout.get().findViewById(R.id.noOfflineHits);
         hitDetailViewer = (LinearLayout) debuggerViewerLayout.get().findViewById(R.id.hitDetailViewer);
 
-        bubbleImage = new WeakReference<>(new ImageView(context));
+        bubbleImage = new WeakReference<>(new ATImageView(context));
         bubbleImage.get().setImageDrawable(Tool.getResizedImage(R.drawable.atinternet_logo, context, (int) (94 * metrics.density), (int) (73 * metrics.density)));
         bubbleImage.get().setVisibility(bubbleVisibility);
         bubbleImage.get().setOnTouchListener(this);
@@ -350,9 +349,6 @@ private void inflateViews(Context context) {
         offlineHitsListView.setOnItemClickListener(this);
     }
 
-    /**
-     * Create debugger layout
-     */
     private void addViews() {
         bubbleImageLayoutParams = new WindowManager.LayoutParams(
                 WindowManager.LayoutParams.WRAP_CONTENT,
@@ -374,7 +370,7 @@ private void addViews() {
             debuggerViewerLayout.get().setVisibility(VISIBLE);
             noEventsLayout.setVisibility(debuggerEvents.isEmpty() ? View.VISIBLE : View.GONE);
             noOfflineHitsLayout.setVisibility(offlineHits.isEmpty() ? View.VISIBLE : View.GONE);
-            setAlphaBackground(true);
+            setAlphaBackground(true, true);
         } else if (viewerVisibility == GONE) {
             debuggerViewerLayout.get().setVisibility(GONE);
         }
@@ -409,17 +405,17 @@ private void toggleViewer() {
             offlineHitsListView.setVisibility(!offlineHits.isEmpty() ? View.VISIBLE : View.GONE);
             noEventsLayout.setVisibility(debuggerEvents.isEmpty() ? View.VISIBLE : View.GONE);
             eventListView.setVisibility(!debuggerEvents.isEmpty() ? View.VISIBLE : View.GONE);
-            setAlphaBackground(true);
+            setAlphaBackground(true, true);
         } else {
             viewerVisibility = GONE;
             Tool.setVisibleViewWithAnimation(debuggerViewerLayout.get(), false);
-            setAlphaBackground(false);
+            setAlphaBackground(false, true);
         }
     }
 
-    private void setAlphaBackground(boolean hasReduceAlpha) {
+    private static void setAlphaBackground(boolean hasReduceAlpha, boolean withAnim) {
         AlphaAnimation animation1 = hasReduceAlpha ? new AlphaAnimation(1.f, ALPHA_BACKGROUND) : new AlphaAnimation(ALPHA_BACKGROUND, 1.f);
-        animation1.setDuration(500);
+        animation1.setDuration(withAnim ? 500 : 0);
         animation1.setFillAfter(true);
         ((Activity) context.get()).getWindow().getDecorView().findViewById(android.R.id.content).startAnimation(animation1);
     }
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Dispatcher.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Dispatcher.java
deleted file mode 100644
index e20499db..00000000
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Dispatcher.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
-This SDK is licensed under the MIT license (MIT)
-Copyright (c) 2015- Applied Technologies Internet SAS (registration number B 403 261 258 - Trade and Companies Register of Bordeaux – France)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
- */
-package com.atinternet.tracker;
-
-import android.content.SharedPreferences;
-import android.text.TextUtils;
-
-import java.util.ArrayList;
-
-class Dispatcher {
-
-    private final Tracker tracker;
-
-    Dispatcher(Tracker tracker) {
-        this.tracker = tracker;
-    }
-
-    public void dispatch(BusinessObject... businessObjects) {
-        ArrayList<BusinessObject> trackerObjects;
-        for (BusinessObject businessObject : businessObjects) {
-            businessObject.setEvent();
-
-            if (businessObject instanceof AbstractScreen) {
-                trackerObjects = new ArrayList<BusinessObject>() {{
-                    addAll(tracker.getBusinessObjects().values());
-                }};
-
-                boolean hasOrder = false;
-
-                for (BusinessObject object : trackerObjects) {
-                    if (((object instanceof OnAppAd && ((OnAppAd) object).getAction() == OnAppAd.Action.View)
-                            || object instanceof Order
-                            || object instanceof InternalSearch
-                            || object instanceof ScreenInfo) &&
-                            object.getTimestamp() < businessObject.getTimestamp()) {
-
-                        if (object instanceof Order) {
-                            hasOrder = true;
-                        }
-
-                        object.setEvent();
-                        tracker.getBusinessObjects().remove(object.getId());
-                    }
-                }
-
-                if (tracker.Cart().getCartId() != null && (((Screen) businessObject).isBasketScreen() || hasOrder)) {
-                    tracker.Cart().setEvent();
-                }
-            } else if (businessObject instanceof Gesture) {
-                trackerObjects = new ArrayList<BusinessObject>() {{
-                    addAll(tracker.getBusinessObjects().values());
-                }};
-
-                if (((Gesture) businessObject).getAction() == Gesture.Action.InternalSearch) {
-                    for (BusinessObject object : trackerObjects) {
-                        if ((object instanceof InternalSearch) && object.getTimestamp() < businessObject.getTimestamp()) {
-                            object.setEvent();
-                            tracker.getBusinessObjects().remove(object.getId());
-                        }
-                    }
-                }
-            }
-
-            tracker.getBusinessObjects().remove(businessObject.getId());
-            trackerObjects = new ArrayList<BusinessObject>() {{
-                addAll(tracker.getBusinessObjects().values());
-            }};
-
-            for (BusinessObject object : trackerObjects) {
-                if ((object instanceof CustomObject || object instanceof NuggAd) && object.getTimestamp() < businessObject.getTimestamp()) {
-                    object.setEvent();
-                    tracker.getBusinessObjects().remove(object.getId());
-                }
-            }
-        }
-
-        if (Hit.getHitType(tracker.getBuffer().getVolatileParams(), tracker.getBuffer().getPersistentParams()) == Hit.HitType.Screen) {
-            TechnicalContext.screenName = Tool.appendParameterValues(Hit.HitParam.Screen.stringValue(), tracker.getBuffer().getVolatileParams(), tracker.getBuffer().getPersistentParams());
-            CrashDetectionHandler.setCrashLastScreen(TechnicalContext.screenName);
-
-            String level2 = Tool.appendParameterValues(Hit.HitParam.Level2.stringValue(), tracker.getBuffer().getVolatileParams(), tracker.getBuffer().getPersistentParams());
-            TechnicalContext.level2 = (!TextUtils.isEmpty(level2)) ? Integer.parseInt(level2) : 0;
-
-            SharedPreferences preferences = Tracker.getPreferences();
-            if (!preferences.getBoolean(TrackerConfigurationKeys.CAMPAIGN_ADDED_KEY, false)) {
-                String xtor = preferences.getString(TrackerConfigurationKeys.MARKETING_CAMPAIGN_SAVED, null);
-                if (xtor != null) {
-                    ParamOption beforeStcPositionWithEncoding = new ParamOption()
-                            .setRelativePosition(ParamOption.RelativePosition.before)
-                            .setRelativeParameterKey(Hit.HitParam.JSON.stringValue())
-                            .setEncode(true);
-
-                    if (preferences.getBoolean(TrackerConfigurationKeys.IS_FIRST_AFTER_INSTALL_HIT_KEY, true)) {
-                        tracker.setParam(Hit.HitParam.Source.stringValue(), xtor, beforeStcPositionWithEncoding);
-                        preferences.edit().putBoolean(TrackerConfigurationKeys.IS_FIRST_AFTER_INSTALL_HIT_KEY, false).apply();
-                    } else {
-                        tracker.setParam(Hit.HitParam.RemanentSource.stringValue(), xtor, beforeStcPositionWithEncoding);
-                    }
-                    preferences.edit().putBoolean(TrackerConfigurationKeys.CAMPAIGN_ADDED_KEY, true).apply();
-                }
-            }
-        }
-
-        setIdentifiedVisitorInfos();
-
-        ParamOption appendWithEncoding = new ParamOption().setAppend(true).setEncode(true);
-        tracker.setParam(Hit.HitParam.JSON.stringValue(), LifeCycle.getMetrics(Tracker.getPreferences()), appendWithEncoding);
-        if ((Boolean) tracker.getConfiguration().get(TrackerConfigurationKeys.ENABLE_CRASH_DETECTION)) {
-            tracker.setParam(Hit.HitParam.JSON.stringValue(), CrashDetectionHandler.getCrashInformation(), appendWithEncoding);
-        }
-
-        String referrer = Tracker.getPreferences().getString(TrackerConfigurationKeys.REFERRER, null);
-        if (!TextUtils.isEmpty(referrer)) {
-            tracker.setParam(Hit.HitParam.Refstore.stringValue(), referrer);
-            Tracker.getPreferences().edit().putString(TrackerConfigurationKeys.REFERRER, null).apply();
-        }
-
-        Builder builder = new Builder(tracker);
-        tracker.getBuffer().getVolatileParams().clear();
-        TrackerQueue.getInstance().put(builder);
-
-        tracker.Context().setLevel2(tracker.Context().getLevel2());
-    }
-
-    /**
-     * Add identified visitor infos
-     */
-    void setIdentifiedVisitorInfos() {
-        if (Boolean.parseBoolean(String.valueOf(tracker.getConfiguration().get(TrackerConfigurationKeys.PERSIST_IDENTIFIED_VISITOR)))) {
-            ParamOption beforeStcPosition = new ParamOption()
-                    .setRelativePosition(ParamOption.RelativePosition.before)
-                    .setRelativeParameterKey(Hit.HitParam.JSON.stringValue());
-
-            ParamOption beforeStcPositionWithEncoding = new ParamOption()
-                    .setRelativePosition(ParamOption.RelativePosition.before)
-                    .setRelativeParameterKey(Hit.HitParam.JSON.stringValue()).setEncode(true);
-
-            String visitorNumericID = Tracker.getPreferences().getString(IdentifiedVisitor.VISITOR_NUMERIC, null);
-            String visitorCategory = Tracker.getPreferences().getString(IdentifiedVisitor.VISITOR_CATEGORY, null);
-            String visitorTextID = Tracker.getPreferences().getString(IdentifiedVisitor.VISITOR_TEXT, null);
-            if (visitorNumericID != null) {
-                tracker.setParam(Hit.HitParam.VisitorIdentifierNumeric.stringValue(), visitorNumericID, beforeStcPosition);
-            }
-            if (visitorTextID != null) {
-                tracker.setParam(Hit.HitParam.VisitorIdentifierText.stringValue(), visitorTextID, beforeStcPositionWithEncoding);
-            }
-            if (visitorCategory != null) {
-                tracker.setParam(Hit.HitParam.VisitorCategory.stringValue(), visitorCategory, beforeStcPosition);
-            }
-        }
-    }
-}
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/DynamicScreen.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/DynamicScreen.java
index 3a3ee472..55f68542 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/DynamicScreen.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/DynamicScreen.java
@@ -26,27 +26,28 @@ of this software and associated documentation files (the "Software"), to deal
 import java.util.Date;
 import java.util.Locale;
 
+/**
+ * Wrapper class for dynamic screen tracking
+ */
 public class DynamicScreen extends AbstractScreen {
 
     private static final String UPDATE_FORMAT = "yyyyMMddHHmm";
-
     private String screenId;
-
     private Date update;
 
     /**
-     * Get the id
+     * Get the dynamic screen identifier
      *
-     * @return String
+     * @return the screen identifier
      */
     public String getScreenId() {
         return screenId;
     }
 
     /**
-     * Get the update date
+     * Get the dynamic screen update date
      *
-     * @return Date
+     * @return the screen update date
      */
     public Date getUpdate() {
         return update;
@@ -54,10 +55,10 @@ public Date getUpdate() {
 
 
     /**
-     * Set a new id
+     * Set a new screen id
      *
-     * @param screenId int
-     * @return DynamicScreen
+     * @param screenId screen identifier
+     * @return the DynamicScreen instance
      * @deprecated Since 2.2.1, use {@link #setScreenId(String)} instead.
      */
     @Deprecated
@@ -67,10 +68,10 @@ public DynamicScreen setScreenId(int screenId) {
     }
 
     /**
-     * Set a new id
+     * Set a new screen id
      *
-     * @param screenId String
-     * @return DynamicScreen
+     * @param screenId screen identifier
+     * @return the DynamicScreen instance
      */
     public DynamicScreen setScreenId(String screenId) {
         this.screenId = screenId;
@@ -80,8 +81,8 @@ public DynamicScreen setScreenId(String screenId) {
     /**
      * Set a new first chapter
      *
-     * @param chapter1 String
-     * @return DynamicScreen
+     * @param chapter1 /
+     * @return the DynamicScreen instance
      */
     public DynamicScreen setChapter1(String chapter1) {
         this.chapter1 = chapter1;
@@ -91,8 +92,8 @@ public DynamicScreen setChapter1(String chapter1) {
     /**
      * Set a new second chapter
      *
-     * @param chapter2 String
-     * @return DynamicScreen
+     * @param chapter2 /
+     * @return the DynamicScreen instance
      */
     public DynamicScreen setChapter2(String chapter2) {
         this.chapter2 = chapter2;
@@ -102,8 +103,8 @@ public DynamicScreen setChapter2(String chapter2) {
     /**
      * Set a new third chapter
      *
-     * @param chapter3 String
-     * @return DynamicScreen
+     * @param chapter3 /
+     * @return the DynamicScreen instance
      */
     public DynamicScreen setChapter3(String chapter3) {
         this.chapter3 = chapter3;
@@ -113,8 +114,8 @@ public DynamicScreen setChapter3(String chapter3) {
     /**
      * Set a new update date
      *
-     * @param update Date
-     * @return DynamicScreen
+     * @param update update date
+     * @return the DynamicScreen instance
      */
     public DynamicScreen setUpdate(Date update) {
         this.update = update;
@@ -124,8 +125,8 @@ public DynamicScreen setUpdate(Date update) {
     /**
      * Set a new name
      *
-     * @param name String
-     * @return DynamicScreen
+     * @param name /
+     * @return the DynamicScreen instance
      */
     public DynamicScreen setName(String name) {
         this.name = name;
@@ -136,8 +137,8 @@ public DynamicScreen setName(String name) {
     /**
      * Set a new action
      *
-     * @param action Action
-     * @return DynamiceScreen
+     * @param action /
+     * @return the DynamicScreen instance
      */
     public DynamicScreen setAction(Action action) {
         this.action = action;
@@ -148,8 +149,8 @@ public DynamicScreen setAction(Action action) {
     /**
      * Set a new level 2
      *
-     * @param level2 int
-     * @return DynamicScreen
+     * @param level2 /
+     * @return the DynamicScreen instance
      */
     public DynamicScreen setLevel2(int level2) {
         this.level2 = level2;
@@ -160,8 +161,8 @@ public DynamicScreen setLevel2(int level2) {
     /**
      * Change boolean isBasketScreen value
      *
-     * @param isBasketScreen boolean
-     * @return DynamicScreen
+     * @param isBasketScreen /
+     * @return the DynamicScreen instance
      */
     public DynamicScreen setIsBasketScreen(boolean isBasketScreen) {
         this.isBasketScreen = isBasketScreen;
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/DynamicScreens.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/DynamicScreens.java
index 0af5a519..b7378b7d 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/DynamicScreens.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/DynamicScreens.java
@@ -24,6 +24,9 @@ of this software and associated documentation files (the "Software"), to deal
 
 import java.util.Date;
 
+/**
+ * Wrapper class to manage Screen instances
+ */
 public class DynamicScreens extends Helper {
 
     DynamicScreens(Tracker tracker) {
@@ -31,12 +34,12 @@ public class DynamicScreens extends Helper {
     }
 
     /**
-     * Add an dynamic label
+     * Add a new dynamic screen
      *
-     * @param screenId int
-     * @param name     String
-     * @param update   Date
-     * @return DynamicScreen
+     * @param screenId dynamic screen identifier
+     * @param name     dynamic screen name
+     * @param update   dynamic screen update date
+     * @return the DynamicScreen instance
      * @deprecated Since 2.2.1, use {@link #add(String, String, Date)} instead.
      */
     @Deprecated
@@ -52,12 +55,12 @@ public DynamicScreen add(int screenId, String name, Date update) {
     }
 
     /**
-     * Add an dynamic label
+     * Add a new dynamic screen
      *
-     * @param screenId String
-     * @param name     String
-     * @param update   Date
-     * @return DynamicScreen
+     * @param screenId dynamic screen identifier
+     * @param name     dynamic screen name
+     * @param update   dynamic screen update date
+     * @return the DynamicScreen instance
      */
     public DynamicScreen add(String screenId, String name, Date update) {
         DynamicScreen dynamicScreen = new DynamicScreen(tracker)
@@ -71,13 +74,13 @@ public DynamicScreen add(String screenId, String name, Date update) {
     }
 
     /**
-     * Add an dynamic label
+     * Add a new dynamic screen
      *
-     * @param screenId int
-     * @param name     String
-     * @param update   Date
-     * @param chapter1 String
-     * @return DynamicScreen
+     * @param screenId dynamic screen identifier
+     * @param name     dynamic screen name
+     * @param update   dynamic screen update date
+     * @param chapter1 dynamic screen first chapter
+     * @return the DynamicScreen instance
      * @deprecated Since 2.2.1, use {@link #add(String, String, Date, String)} instead.
      */
     @Deprecated
@@ -86,27 +89,27 @@ public DynamicScreen add(int screenId, String name, Date update, String chapter1
     }
 
     /**
-     * Add an dynamic label
+     * Add a new dynamic screen
      *
-     * @param screenId String
-     * @param name     String
-     * @param update   Date
-     * @param chapter1 String
-     * @return DynamicScreen
+     * @param screenId dynamic screen identifier
+     * @param name     dynamic screen name
+     * @param update   dynamic screen update date
+     * @param chapter1 dynamic screen first chapter
+     * @return the DynamicScreen instance
      */
     public DynamicScreen add(String screenId, String name, Date update, String chapter1) {
         return add(screenId, name, update).setChapter1(chapter1);
     }
 
     /**
-     * Add an dynamic label
+     * Add a new dynamic screen
      *
-     * @param screenId int
-     * @param name     String
-     * @param update   Date
-     * @param chapter1 String
-     * @param chapter2 String
-     * @return DynamicScreen
+     * @param screenId dynamic screen identifier
+     * @param name     dynamic screen name
+     * @param update   dynamic screen update date
+     * @param chapter1 dynamic screen first chapter
+     * @param chapter2 dynamic screen second chapter
+     * @return the DynamicScreen instance
      * @deprecated Since 2.2.1, use {@link #add(String, String, Date, String, String)} instead.
      */
     @Deprecated
@@ -115,29 +118,29 @@ public DynamicScreen add(int screenId, String name, Date update, String chapter1
     }
 
     /**
-     * Add an dynamic label
+     * Add a new dynamic screen
      *
-     * @param screenId String
-     * @param name     String
-     * @param update   Date
-     * @param chapter1 String
-     * @param chapter2 String
-     * @return DynamicScreen
+     * @param screenId dynamic screen identifier
+     * @param name     dynamic screen name
+     * @param update   dynamic screen update date
+     * @param chapter1 dynamic screen first chapter
+     * @param chapter2 dynamic screen second chapter
+     * @return the DynamicScreen instance
      */
     public DynamicScreen add(String screenId, String name, Date update, String chapter1, String chapter2) {
         return add(screenId, name, update, chapter1).setChapter2(chapter2);
     }
 
     /**
-     * Add an dynamic label
+     * Add a new dynamic screen
      *
-     * @param screenId int
-     * @param name     String
-     * @param update   Date
-     * @param chapter1 String
-     * @param chapter2 String
-     * @param chapter3 String
-     * @return DynamicScreen
+     * @param screenId dynamic screen identifier
+     * @param name     dynamic screen name
+     * @param update   dynamic screen update date
+     * @param chapter1 dynamic screen first chapter
+     * @param chapter2 dynamic screen second chapter
+     * @param chapter3 dynamic screen third chapter
+     * @return the DynamicScreen instance
      * @deprecated Since 2.2.1, use {@link #add(String, String, Date, String, String, String)} instead.
      */
     @Deprecated
@@ -146,15 +149,15 @@ public DynamicScreen add(int screenId, String name, Date update, String chapter1
     }
 
     /**
-     * Add an dynamic label
+     * Add a new dynamic screen
      *
-     * @param screenId String
-     * @param name     String
-     * @param update   Date
-     * @param chapter1 String
-     * @param chapter2 String
-     * @param chapter3 String
-     * @return DynamicScreen
+     * @param screenId dynamic screen identifier
+     * @param name     dynamic screen name
+     * @param update   dynamic screen update date
+     * @param chapter1 dynamic screen first chapter
+     * @param chapter2 dynamic screen second chapter
+     * @param chapter3 dynamic screen third chapter
+     * @return the DynamicScreen instance
      */
     public DynamicScreen add(String screenId, String name, Date update, String chapter1, String chapter2, String chapter3) {
         return add(screenId, name, update, chapter1, chapter2).setChapter3(chapter3);
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Gesture.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Gesture.java
index c70c8911..da7afd85 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Gesture.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Gesture.java
@@ -26,16 +26,34 @@ of this software and associated documentation files (the "Software"), to deal
 
 import java.util.LinkedHashMap;
 
+/**
+ * Wrapper class for gesture tracking
+ */
 public class Gesture extends BusinessObject {
 
     /**
      * Enum with different type of gesture
      */
     public enum Action {
+        /**
+         * Simple gesture
+         */
         Touch("A"),
+        /**
+         * Navigation gesture
+         */
         Navigate("N"),
+        /**
+         * Download action
+         */
         Download("T"),
+        /**
+         * Exit action
+         */
         Exit("S"),
+        /**
+         * Internal search action
+         */
         InternalSearch("IS");
 
         private final String str;
@@ -64,8 +82,15 @@ LinkedHashMap<String, CustomObject> getCustomObjectsMap() {
         return customObjectsMap == null ? (customObjectsMap = new LinkedHashMap<>()) : customObjectsMap;
     }
 
+    Gesture(Tracker tracker) {
+        super(tracker);
+        action = Action.Touch;
+        level2 = -1;
+        name = "";
+    }
+
     /**
-     * Add an InternalSearch
+     * Attach an InternalSearch to gesture
      *
      * @param keywordLabel       String
      * @param resultScreenNumber int
@@ -80,12 +105,12 @@ public InternalSearch InternalSearch(String keywordLabel, int resultScreenNumber
     }
 
     /**
-     * Add an InternalSearch
+     * Attach internal search information to gesture
      *
-     * @param keywordLabel       String
-     * @param resultScreenNumber int
-     * @param resultPosition     int
-     * @return InternalSearch
+     * @param keywordLabel       keyword has been searched
+     * @param resultScreenNumber screen result number
+     * @param resultPosition     screen result position gesture
+     * @return the InternalSearch instance
      */
     public InternalSearch InternalSearch(String keywordLabel, int resultScreenNumber, int resultPosition) {
         return internalSearch == null ? (internalSearch = new InternalSearch(tracker)
@@ -97,25 +122,25 @@ public InternalSearch InternalSearch(String keywordLabel, int resultScreenNumber
     /**
      * Get CustomObjects
      *
-     * @return CustomObjects
+     * @return CustomObjects instance
      */
     public CustomObjects CustomObjects() {
         return customObjects == null ? (customObjects = new CustomObjects(this)) : customObjects;
     }
 
     /**
-     * Get the name
+     * Get the gesture name
      *
-     * @return String
+     * @return the gesture name
      */
     public String getName() {
         return name;
     }
 
     /**
-     * Get the first chapter1
+     * Get the first chapter
      *
-     * @return String
+     * @return the first chapter1
      */
     public String getChapter1() {
         return chapter1;
@@ -124,7 +149,7 @@ public String getChapter1() {
     /**
      * Get the second chapter
      *
-     * @return String
+     * @return the second chapter
      */
     public String getChapter2() {
         return chapter2;
@@ -133,7 +158,7 @@ public String getChapter2() {
     /**
      * Get the third chapter
      *
-     * @return String
+     * @return the third chapter
      */
     public String getChapter3() {
         return chapter3;
@@ -142,7 +167,7 @@ public String getChapter3() {
     /**
      * Get the action type
      *
-     * @return String
+     * @return the action type
      */
     public Action getAction() {
         return action;
@@ -151,17 +176,17 @@ public Action getAction() {
     /**
      * Get the level 2
      *
-     * @return int
+     * @return the level 2
      */
     public int getLevel2() {
         return level2;
     }
 
     /**
-     * Set a new name
+     * Set a new gesture name
      *
-     * @param name String
-     * @return Gesture
+     * @param name /
+     * @return Gesture instance
      */
     public Gesture setName(String name) {
         this.name = name;
@@ -172,8 +197,8 @@ public Gesture setName(String name) {
     /**
      * Set a new first chapter
      *
-     * @param chapter1 String
-     * @return Gesture
+     * @param chapter1 /
+     * @return Gesture instance
      */
     public Gesture setChapter1(String chapter1) {
         this.chapter1 = chapter1;
@@ -184,8 +209,8 @@ public Gesture setChapter1(String chapter1) {
     /**
      * Set a new second chapter
      *
-     * @param chapter2 String
-     * @return Gesture
+     * @param chapter2 /
+     * @return Gesture instance
      */
     public Gesture setChapter2(String chapter2) {
         this.chapter2 = chapter2;
@@ -196,8 +221,8 @@ public Gesture setChapter2(String chapter2) {
     /**
      * Set a new third chapter
      *
-     * @param chapter3 String
-     * @return Gesture
+     * @param chapter3 /
+     * @return Gesture instance
      */
     public Gesture setChapter3(String chapter3) {
         this.chapter3 = chapter3;
@@ -208,8 +233,8 @@ public Gesture setChapter3(String chapter3) {
     /**
      * Set a new action
      *
-     * @param action Gesture.Action
-     * @return Gesture
+     * @param action /
+     * @return Gesture instance
      */
     public Gesture setAction(Action action) {
         this.action = action;
@@ -220,8 +245,8 @@ public Gesture setAction(Action action) {
     /**
      * Set a new level2
      *
-     * @param level2 int
-     * @return Gesture
+     * @param level2 /
+     * @return Gesture instance
      */
     public Gesture setLevel2(int level2) {
         this.level2 = level2;
@@ -230,7 +255,7 @@ public Gesture setLevel2(int level2) {
     }
 
     /**
-     * Send a gesture navigation hit
+     * Send a gesture navigation event
      */
     public void sendNavigation() {
         action = Action.Navigate;
@@ -238,7 +263,7 @@ public void sendNavigation() {
     }
 
     /**
-     * Send a gesture exit hit
+     * Send a gesture exit event
      */
     public void sendExit() {
         action = Action.Exit;
@@ -246,7 +271,7 @@ public void sendExit() {
     }
 
     /**
-     * Send a gesture download hit
+     * Send a gesture download event
      */
     public void sendDownload() {
         action = Action.Download;
@@ -255,7 +280,7 @@ public void sendDownload() {
     }
 
     /**
-     * Send a gesture action hit
+     * Send a gesture action event
      */
     public void sendTouch() {
         action = Action.Touch;
@@ -263,20 +288,13 @@ public void sendTouch() {
     }
 
     /**
-     * Send a gesture search hit
+     * Send a gesture search event
      */
     public void sendSearch() {
         action = Action.InternalSearch;
         tracker.getDispatcher().dispatch(this);
     }
 
-    Gesture(Tracker tracker) {
-        super(tracker);
-        action = Action.Touch;
-        level2 = -1;
-        name = "";
-    }
-
 
     @Override
     void setEvent() {
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Gestures.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Gestures.java
index de4d0726..a69d4208 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Gestures.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Gestures.java
@@ -22,6 +22,9 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
+/**
+ * Wrapper class to manage Gesture instances
+ */
 public class Gestures extends Helper {
 
     Gestures(Tracker tracker) {
@@ -31,7 +34,7 @@ public class Gestures extends Helper {
     /**
      * Add a gesture
      *
-     * @return Gesture
+     * @return a new Gesture instance
      */
     public Gesture add() {
         Gesture gesture = new Gesture(tracker);
@@ -43,7 +46,7 @@ public Gesture add() {
     /**
      * Add a gesture
      *
-     * @param context android.content.Context
+     * @param context current Activity context
      * @return Gesture
      */
     public Gesture add(android.content.Context context) {
@@ -57,8 +60,8 @@ public Gesture add(android.content.Context context) {
     /**
      * Add a gesture
      *
-     * @param name String
-     * @return Gesture
+     * @param name gesture name
+     * @return a new Gesture instance
      */
     public Gesture add(String name) {
         Gesture gesture = new Gesture(tracker)
@@ -71,9 +74,9 @@ public Gesture add(String name) {
     /**
      * Add a gesture
      *
-     * @param name     String
-     * @param chapter1 String
-     * @return Gesture
+     * @param name     gesture name
+     * @param chapter1 gesture first chapter
+     * @return a new Gesture instance
      */
     public Gesture add(String name, String chapter1) {
         Gesture gesture = new Gesture(tracker);
@@ -86,10 +89,10 @@ public Gesture add(String name, String chapter1) {
     /**
      * Add a gesture
      *
-     * @param name     String
-     * @param chapter1 String
-     * @param chapter2 String
-     * @return Gesture
+     * @param name     gesture name
+     * @param chapter1 gesture first chapter
+     * @param chapter2 gesture second chapter
+     * @return a new Gesture instance
      */
     public Gesture add(String name, String chapter1, String chapter2) {
         Gesture gesture = new Gesture(tracker)
@@ -102,11 +105,11 @@ public Gesture add(String name, String chapter1, String chapter2) {
     /**
      * Add a gesture
      *
-     * @param name     String
-     * @param chapter1 String
-     * @param chapter2 String
-     * @param chapter3 String
-     * @return Gesture
+     * @param name     gesture name
+     * @param chapter1 gesture first chapter
+     * @param chapter2 gesture second chapter
+     * @param chapter3 gesture third chapter
+     * @return a new Gesture instance
      */
     public Gesture add(String name, String chapter1, String chapter2, String chapter3) {
         Gesture gesture = new Gesture(tracker)
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Hit.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Hit.java
index 2ed2f1d7..a257dddb 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Hit.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Hit.java
@@ -24,52 +24,169 @@ of this software and associated documentation files (the "Software"), to deal
 
 import android.text.TextUtils;
 
-import java.util.ArrayList;
 import java.util.Date;
+import java.util.LinkedHashMap;
 
+/**
+ * Class to provide hit information
+ */
 public class Hit {
 
     /**
      * Enum with different hit parameter keys
      */
     public enum HitParam {
+        /**
+         * Aisle parameter key
+         */
         Aisle("aisl"),
+        /**
+         * Screen parameter key
+         */
         Screen("p"),
+        /**
+         * Level 2 parameter key
+         */
         Level2("s2"),
+        /**
+         * Custom tree structure parameter key
+         */
         CustomTreeStructure("ptype"),
+        /**
+         * Custom object parameter key
+         */
         JSON("stc"),
+        /**
+         * User Id parameter key
+         */
         UserId("idclient"),
+        /**
+         * Action parameter key
+         */
         Action("action"),
+        /**
+         * Store referrer parameter key
+         */
         Refstore("refstore"),
+        /**
+         * Referrer parameter key
+         */
         Referrer("ref"),
+        /**
+         * Hit type parameter key
+         */
         HitType("type"),
+        /**
+         * Touch gesture parameter key
+         */
         Touch("click"),
+        /**
+         * Touched screen parameter key
+         */
         TouchScreen("pclick"),
+        /**
+         * Advertising screen parameter key
+         */
         OnAppAdTouchScreen("patc"),
+        /**
+         * Touched screen level 2 parameter key
+         */
         TouchLevel2("s2click"),
+        /**
+         * Touched advertising level 2 parameter key
+         */
         OnAppAdTouchLevel2("s2atc"),
+        /**
+         * Numeric visitor identifier parameter key
+         */
         VisitorIdentifierNumeric("an"),
+        /**
+         * Textual visitor identifier parameter key
+         */
         VisitorIdentifierText("at"),
+        /**
+         * Identified visitor category parameter key
+         */
         VisitorCategory("ac"),
+        /**
+         * Background mode parameter key
+         */
         BackgroundMode("bg"),
+        /**
+         * Touched advertising parameter key
+         */
         OnAppAdsTouch("atc"),
+        /**
+         * Advertising impression parameter key
+         */
         OnAppAdsImpression("ati"),
+        /**
+         * Location latitude parameter key
+         */
         GPSLatitude("gy"),
+        /**
+         * Location longitude parameter key
+         */
         GPSLongitude("gx"),
+        /**
+         * Enable TVTracking parameter key
+         */
         TVT("tvt"),
+        /**
+         * New marketing campaign parameter key
+         */
         Source("xto"),
+        /**
+         * RichMedia duration parameter key
+         */
         MediaDuration("m1"),
+        /**
+         * Remanent marketing campaign parameter key
+         */
         RemanentSource("xtor"),
+        /**
+         * Tp parameter key
+         */
         Tp("tp"),
+        /**
+         * Product list parameter key
+         */
         ProductList("pdtl"),
+        /**
+         * Dynamic screen identifier parameter key
+         */
         DynamicScreenId("pid"),
+        /**
+         * Dynamic screen value parameter key
+         */
         DynamicScreenValue("pchap"),
+        /**
+         * Dynamic screen date parameter key
+         */
         DynamicScreenDate("pidt"),
+        /**
+         * Internal search keyword parameter key
+         */
         InternalSearchKeyword("mc"),
+        /**
+         * Internal search result screen number parameter key
+         */
         InternalSearchResultScreenNumber("np"),
+        /**
+         * Internal search result position parameter key
+         */
         InternalSearchResultPosition("mcrg"),
+        /**
+         * Cart identifier parameter key
+         */
         CartId("idcart"),
+        /**
+         * RichMedia level 2 parameter key
+         */
         RichMediaLevel2("s2rich"),
+        /**
+         * RichMedia screen parameter key
+         */
         RichMediaScreen("prich");
 
         private final String str;
@@ -98,7 +215,7 @@ public enum HitType {
     /**
      * Default constructor
      *
-     * @param url String
+     * @param url the complete hit
      */
     public Hit(String url) {
         this.url = url;
@@ -110,10 +227,10 @@ public Hit(String url) {
     /**
      * Constructor with parameters
      *
-     * @param url       String
-     * @param date      Date
-     * @param retry     int
-     * @param isOffline boolean
+     * @param url       the complete hit
+     * @param date      hit building date
+     * @param retry     sending retry count
+     * @param isOffline true if hit come from storage
      */
     public Hit(String url, Date date, int retry, boolean isOffline) {
         this(url);
@@ -123,68 +240,68 @@ public Hit(String url, Date date, int retry, boolean isOffline) {
     }
 
     /**
-     * Get the url
+     * Get the hit
      *
-     * @return String
+     * @return the hit
      */
     public String getUrl() {
         return url;
     }
 
     /**
-     * Get the date of the hit
+     * Get the hit date
      *
-     * @return Date
+     * @return the hit date
      */
     public Date getDate() {
         return date;
     }
 
     /**
-     * Get the retry number
+     * Get the sending retry count
      *
-     * @return int
+     * @return the retry count
      */
     public int getRetry() {
         return retry;
     }
 
     /**
-     * Get the offline property
+     * Get the "isOffline" property value
      *
-     * @return boolean
+     * @return true if hit come from storage
      */
     public boolean isOffline() {
         return isOffline;
     }
 
-    static HitType getHitType(final ArrayList<Param> volatileParams, final ArrayList<Param> persistentParams) {
-        ArrayList<Param> buffer = new ArrayList<Param>() {{
-            addAll(volatileParams);
-            addAll(persistentParams);
+    static HitType getHitType(final LinkedHashMap<String, Param> volatileParams, final LinkedHashMap<String, Param> persistentParams) {
+        LinkedHashMap<String, Param> buffer = new LinkedHashMap<String, Param>() {{
+            putAll(volatileParams);
+            putAll(persistentParams);
         }};
 
         HitType type = HitType.Screen;
 
-        for (Param p : buffer) {
-            if (p.getKey().equals("clic") || p.getKey().equals("click") || (p.getKey().equals("type") && Lists.getProcessedTypes().containsKey(p.getValue().execute()))) {
-                if (p.getKey().equals("type")) {
-                    type = Lists.getProcessedTypes().get(p.getValue().execute());
-                    break;
-                }
+        if (buffer.containsKey("clic") || buffer.containsKey("click")) {
+            type = HitType.Touch;
+        }
 
-                if (p.getKey().equals("clic") || p.getKey().equals("click")) {
-                    type = HitType.Touch;
-                }
+        Param typeParam;
+        if ((typeParam = buffer.get("type")) != null) {
+            HitType typeVal;
+            if ((typeVal = Lists.getProcessedTypes().get(typeParam.getValues().get(0).execute())) != null) {
+                type = typeVal;
             }
         }
+
         return type;
     }
 
     /**
-     * Get the type for offline type
+     * Get the hit type
      *
-     * @return HitType
+     * @return the hit type
      */
     public HitType getHitType() {
         HitType type = HitType.Screen;
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/IdentifiedVisitor.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/IdentifiedVisitor.java
index 5205558c..6645ecef 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/IdentifiedVisitor.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/IdentifiedVisitor.java
@@ -22,6 +22,9 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
+/**
+ * Wrapper class for identified visitor tracking
+ */
 public class IdentifiedVisitor {
 
     static final String VISITOR_NUMERIC = "ATVisitorNumeric";
@@ -39,10 +42,10 @@ public class IdentifiedVisitor {
     }
 
     /**
-     * Set Identified visitor ID (numeric) for all next hits
+     * Set Identified visitor for the current session
      *
-     * @param visitorId long
-     * @return Tracker
+     * @param visitorId numeric identifier
+     * @return Tracker instance
      */
     public Tracker set(long visitorId) {
         unset();
@@ -52,11 +55,11 @@ public Tracker set(long visitorId) {
     }
 
     /**
-     * Set Identified visitor ID (numeric) with category for all next hits
+     * Set Identified visitor for the current session
      *
-     * @param visitorId       long
-     * @param visitorCategory int
-     * @return Tracker
+     * @param visitorId       numeric identifier
+     * @param visitorCategory visitor category
+     * @return Tracker instance
      */
     public Tracker set(long visitorId, int visitorCategory) {
         set(visitorId);
@@ -66,10 +69,10 @@ public Tracker set(long visitorId, int visitorCategory) {
     }
 
     /**
-     * Set Identified visitor ID (text) for all next hits
+     * Set Identified visitor for the current session
      *
-     * @param visitorId String
-     * @return Tracker
+     * @param visitorId textual identifier
+     * @return Tracker instance
      */
     public Tracker set(String visitorId) {
         unset();
@@ -79,11 +82,11 @@ public Tracker set(String visitorId) {
     }
 
     /**
-     * Set Identified visitor ID (text) with category for all next hits
+     * Set Identified visitor for the current session
      *
-     * @param visitorId       String
-     * @param visitorCategory int
-     * @return Tracker
+     * @param visitorId       textual identifier
+     * @param visitorCategory visitor category
+     * @return Tracker instance
      */
     public Tracker set(String visitorId, int visitorCategory) {
         set(visitorId);
@@ -93,7 +96,7 @@ public Tracker set(String visitorId, int visitorCategory) {
     }
 
     /**
-     * Unset identified visitor ID. Identified visitor ID (numeric and text) and category parameters won't appear in next hits
+     * Unset identified visitor data. Identified visitor parameters won't appear in next hits
      */
     public void unset() {
         tracker.unsetParam(Hit.HitParam.VisitorIdentifierNumeric.stringValue());
@@ -104,13 +107,6 @@ public void unset() {
                 .putString(VISITOR_TEXT, null).apply();
     }
 
-    /**
-     * Save helper to manage identified visitor
-     *
-     * @param key            String
-     * @param preferencesKey String
-     * @param value          String
-     */
     private void save(String key, String preferencesKey, String value) {
         if (persistIdentifiedVisitor) {
             Tracker.getPreferences().edit().putString(preferencesKey, value).apply();
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/BusinessObject.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/InstanceTypeObject.java
similarity index 84%
rename from ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/BusinessObject.java
rename to ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/InstanceTypeObject.java
index 4cc42c10..8e89c765 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/BusinessObject.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/InstanceTypeObject.java
@@ -26,22 +26,12 @@ of this software and associated documentation files (the "Software"), to deal
 
 abstract class BusinessObject {
 
-    /**
-     * Hit id
-     */
-    final String id;
-
-    /**
-     * Creation date
-     */
-    private final long timestamp;
+    protected final String id;
+    protected Tracker tracker;
 
-    /**
-     * Tracker instance
-     */
-    Tracker tracker;
+    private final long timestamp;
 
-    public String getId() {
+    String getId() {
         return id;
     }
 
@@ -53,26 +43,35 @@ Tracker getTracker() {
         return tracker;
     }
 
-    /**
-     * Set parameters in buffer
-     */
     abstract void setEvent();
 
-    /**
-     * Super constructor
-     */
     BusinessObject() {
         id = UUID.randomUUID().toString();
         timestamp = System.nanoTime();
     }
 
-    /**
-     * Super constructor
-     *
-     * @param tracker Tracker
-     */
     BusinessObject(Tracker tracker) {
         this();
         this.tracker = tracker;
     }
 }
+
+abstract class ScreenInfo extends BusinessObject {
+
+    ScreenInfo(Tracker tracker) {
+        super(tracker);
+    }
+}
+
+
+abstract class Helper {
+
+    Tracker tracker;
+
+    Helper(Tracker tracker) {
+        this.tracker = tracker;
+    }
+
+    Helper() {
+    }
+}
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/InternalSearch.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/InternalSearch.java
index 7dc23065..2a29cc9a 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/InternalSearch.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/InternalSearch.java
@@ -22,16 +22,26 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
+/**
+ * Wrapper class for internal search tracking
+ */
 public class InternalSearch extends BusinessObject {
 
     private String keyword;
     private int resultScreenNumber;
     private int resultPosition;
 
+    InternalSearch(Tracker tracker) {
+        super(tracker);
+        keyword = null;
+        resultScreenNumber = 1;
+        resultPosition = -1;
+    }
+
     /**
      * Get keyword
      *
-     * @return String
+     * @return the keyword
      */
     public String getKeyword() {
         return keyword;
@@ -40,7 +50,7 @@ public String getKeyword() {
     /**
      * Get result screen number
      *
-     * @return int
+     * @return the result screen number
      */
     public int getResultScreenNumber() {
         return resultScreenNumber;
@@ -49,7 +59,7 @@ public int getResultScreenNumber() {
     /**
      * Get result position
      *
-     * @return int
+     * @return the result position
      */
     public int getResultPosition() {
         return resultPosition;
@@ -58,8 +68,8 @@ public int getResultPosition() {
     /**
      * Set a new keyword
      *
-     * @param keyword String
-     * @return InternalSearch
+     * @param keyword /
+     * @return InternalSearch instance
      */
     public InternalSearch setKeyword(String keyword) {
         this.keyword = keyword;
@@ -69,8 +79,8 @@ public InternalSearch setKeyword(String keyword) {
     /**
      * Set a new result screen number
      *
-     * @param resultScreenNumber int
-     * @return InternalSearch
+     * @param resultScreenNumber /
+     * @return InternalSearch instance
      */
     public InternalSearch setResultScreenNumber(int resultScreenNumber) {
         this.resultScreenNumber = resultScreenNumber;
@@ -80,21 +90,14 @@ public InternalSearch setResultScreenNumber(int resultScreenNumber) {
     /**
      * Set a new result position
      *
-     * @param resultPosition int
-     * @return InternalSearch
+     * @param resultPosition /
+     * @return InternalSearch instance
      */
     public InternalSearch setResultPosition(int resultPosition) {
         this.resultPosition = resultPosition;
         return this;
     }
 
-    InternalSearch(Tracker tracker) {
-        super(tracker);
-        keyword = null;
-        resultScreenNumber = 1;
-        resultPosition = -1;
-    }
-
     @Override
     void setEvent() {
         tracker.setParam(Hit.HitParam.InternalSearchKeyword.stringValue(), keyword == null ? "" : keyword.replaceAll("\\W", ""))
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/InternalSearches.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/InternalSearches.java
index 7749e312..d3929934 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/InternalSearches.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/InternalSearches.java
@@ -23,6 +23,8 @@ of this software and associated documentation files (the "Software"), to deal
 package com.atinternet.tracker;
 
 /**
+ * Wrapper class to manage InternalSearch instances
+ *
  * @deprecated Since 2.3.0, InternalSearch is now only available as a screen or gesture object property.
  */
 @Deprecated
@@ -35,9 +37,9 @@ public class InternalSearches extends Helper {
     /**
      * Add an internal search
      *
-     * @param keywordLabel     String
-     * @param resultPageNumber int
-     * @return InternalSearch
+     * @param keywordLabel     internal search keyword
+     * @param resultPageNumber internal search result screen number
+     * @return InternalSearch instance
      */
     public InternalSearch add(String keywordLabel, int resultPageNumber) {
         InternalSearch search = new InternalSearch(tracker)
@@ -52,10 +54,10 @@ public InternalSearch add(String keywordLabel, int resultPageNumber) {
     /**
      * Add an internal search
      *
-     * @param keywordLabel     String
-     * @param resultPageNumber int
-     * @param resultPosition   int
-     * @return InternalSearch
+     * @param keywordLabel     internal search keyword
+     * @param resultPageNumber internal search result screen number
+     * @param resultPosition   internal search result position
+     * @return InternalSearch instance
      */
     public InternalSearch add(String keywordLabel, int resultPageNumber, int resultPosition) {
         return add(keywordLabel, resultPageNumber)
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Lists.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Lists.java
deleted file mode 100644
index dc3d6d08..00000000
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Lists.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-This SDK is licensed under the MIT license (MIT)
-Copyright (c) 2015- Applied Technologies Internet SAS (registration number B 403 261 258 - Trade and Companies Register of Bordeaux – France)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
- */
-package com.atinternet.tracker;
-
-import java.util.HashMap;
-import java.util.HashSet;
-
-class Lists {
-
-    /**
-     * Get a map
-     *
-     * @return HashMap
-     */
-    static HashMap<String, Hit.HitType> getProcessedTypes() {
-        return new HashMap<String, Hit.HitType>() {{
-            put("audio", Hit.HitType.Audio);
-            put("video", Hit.HitType.Video);
-            put("vpre", Hit.HitType.Video);
-            put("vmid", Hit.HitType.Video);
-            put("vpost", Hit.HitType.Video);
-            put("animation", Hit.HitType.Animation);
-            put("anim", Hit.HitType.Animation);
-            put("podcast", Hit.HitType.PodCast);
-            put("rss", Hit.HitType.RSS);
-            put("email", Hit.HitType.Email);
-            put("pub", Hit.HitType.Publicite);
-            put("ad", Hit.HitType.Publicite);
-            put("click", Hit.HitType.Touch);
-            put("clic", Hit.HitType.Touch);
-            put("AT", Hit.HitType.AdTracking);
-            put("pdt", Hit.HitType.ProduitImpression);
-            put("mvt", Hit.HitType.MvTesting);
-            put("wbo", Hit.HitType.Weborama);
-            put("screen", Hit.HitType.Screen);
-        }};
-    }
-
-    /**
-     * Get a set <key>
-     *
-     * @return HashSet<String>
-     */
-    static HashSet<String> getReadOnlyConfigs() {
-        return new HashSet<String>() {{
-        }};
-    }
-
-    /**
-     * Get a set <key>
-     *
-     * @return HashSet<String>
-     */
-    static HashSet<String> getReadOnlyParams() {
-        return new HashSet<String>() {{
-            add("vtag");
-            add("ptag");
-            add("lng");
-            add("mfmd");
-            add("os");
-            add("apvr");
-            add("hl");
-            add("r");
-            add("car");
-            add("cn");
-            add("ts");
-        }};
-    }
-
-    /**
-     * Get a set <key>
-     *
-     * @return HashSet<String>
-     */
-    static HashSet<String> getSliceReadyParams() {
-        return new HashSet<String>() {{
-            add("ati");
-            add("atc");
-            add("pdtl");
-            add("stc");
-        }};
-    }
-}
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/LiveAudio.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/LiveAudio.java
index 024f5b3d..139b156e 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/LiveAudio.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/LiveAudio.java
@@ -22,13 +22,22 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
+/**
+ * Wrapper class for live audio tracking
+ */
 public class LiveAudio extends RichMedia {
 
+    LiveAudio(MediaPlayer player) {
+        super(player);
+        broadcastMode = BroadcastMode.Live;
+        type = "audio";
+    }
+
     /**
      * Set a new name
      *
-     * @param name String
-     * @return LiveAudio
+     * @param name /
+     * @return LiveAudio instance
      */
     public LiveAudio setName(String name) {
         this.name = name;
@@ -38,8 +47,8 @@ public LiveAudio setName(String name) {
     /**
      * Set a new level2
      *
-     * @param level2 int
-     * @return LiveAudio
+     * @param level2 /
+     * @return LiveAudio instance
      */
     public LiveAudio setLevel2(int level2) {
         this.level2 = level2;
@@ -48,10 +57,10 @@ public LiveAudio setLevel2(int level2) {
     }
 
     /**
-     * Change boolean isBuffering value
+     * Change boolean "isBuffering" value
      *
-     * @param isBuffering boolean
-     * @return LiveAudio
+     * @param isBuffering /
+     * @return LiveAudio instance
      */
     public LiveAudio setBuffering(boolean isBuffering) {
         this.isBuffering = isBuffering;
@@ -60,10 +69,10 @@ public LiveAudio setBuffering(boolean isBuffering) {
     }
 
     /**
-     * Change boolean isEmbedded value
+     * Change boolean "isEmbedded" value
      *
-     * @param isEmbedded boolean
-     * @return LiveAudio
+     * @param isEmbedded /
+     * @return LiveAudio instance
      */
     public LiveAudio setEmbedded(boolean isEmbedded) {
         this.isEmbedded = isEmbedded;
@@ -74,8 +83,8 @@ public LiveAudio setEmbedded(boolean isEmbedded) {
     /**
      * Set a new first chapter
      *
-     * @param chapter1 String
-     * @return LiveAudio
+     * @param chapter1 /
+     * @return LiveAudio instance
      */
     public LiveAudio setChapter1(String chapter1) {
         this.chapter1 = chapter1;
@@ -85,8 +94,8 @@ public LiveAudio setChapter1(String chapter1) {
     /**
      * Set a new second chapter
      *
-     * @param chapter2 String
-     * @return LiveAudio
+     * @param chapter2 /
+     * @return LiveAudio instance
      */
     public LiveAudio setChapter2(String chapter2) {
         this.chapter2 = chapter2;
@@ -96,8 +105,8 @@ public LiveAudio setChapter2(String chapter2) {
     /**
      * Set a new third chapter
      *
-     * @param chapter3 String
-     * @return LiveAudio
+     * @param chapter3 /
+     * @return LiveAudio instance
      */
     public LiveAudio setChapter3(String chapter3) {
         this.chapter3 = chapter3;
@@ -107,8 +116,8 @@ public LiveAudio setChapter3(String chapter3) {
     /**
      * Set a new action
      *
-     * @param action RichMedia.Action
-     * @return LiveAudio
+     * @param action /
+     * @return LiveAudio instance
      */
     public LiveAudio setAction(Action action) {
         this.action = action;
@@ -119,17 +128,11 @@ public LiveAudio setAction(Action action) {
     /**
      * Set a new webdomain
      *
-     * @param webDomain String
-     * @return LiveAudio
+     * @param webDomain /
+     * @return LiveAudio instance
      */
     public LiveAudio setWebDomain(String webDomain) {
         this.webDomain = webDomain;
         return this;
     }
-
-    LiveAudio(MediaPlayer player) {
-        super(player);
-        broadcastMode = BroadcastMode.Live;
-        type = "audio";
-    }
 }
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/LiveAudios.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/LiveAudios.java
index bbb8fb93..b95209d0 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/LiveAudios.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/LiveAudios.java
@@ -24,6 +24,9 @@ of this software and associated documentation files (the "Software"), to deal
 
 import java.util.ArrayList;
 
+/**
+ * Wrapper class to LiveAudio instances
+ */
 public class LiveAudios {
 
     final ArrayList<LiveAudio> list = new ArrayList<>();
@@ -34,10 +37,10 @@ public class LiveAudios {
     }
 
     /**
-     * Create new audio
+     * Create new LiveAudio
      *
-     * @param name String
-     * @return LiveAudio
+     * @param name live audio name
+     * @return LiveAudio instance
      */
     public LiveAudio add(String name) {
         int index = -1;
@@ -65,9 +68,9 @@ public LiveAudio add(String name) {
     /**
      * Create new LiveAudio
      *
-     * @param name     String
-     * @param chapter1 String
-     * @return LiveAudio
+     * @param name     live audio name
+     * @param chapter1 live audio first chapter
+     * @return LiveAudio instance
      */
     public LiveAudio add(String name, String chapter1) {
         return add(name).setChapter1(chapter1);
@@ -76,10 +79,10 @@ public LiveAudio add(String name, String chapter1) {
     /**
      * Create new LiveAudio
      *
-     * @param name     String
-     * @param chapter1 String
-     * @param chapter2 String
-     * @return LiveAudio
+     * @param name     live audio name
+     * @param chapter1 live audio first chapter
+     * @param chapter2 live audio second chapter
+     * @return LiveAudio instance
      */
     public LiveAudio add(String name, String chapter1, String chapter2) {
         return add(name, chapter1).setChapter2(chapter2);
@@ -88,11 +91,11 @@ public LiveAudio add(String name, String chapter1, String chapter2) {
     /**
      * Create new LiveAudio
      *
-     * @param name     String
-     * @param chapter1 String
-     * @param chapter2 String
-     * @param chapter3 String
-     * @return LiveAudio
+     * @param name     live audio name
+     * @param chapter1 live audio first chapter
+     * @param chapter2 live audio second chapter
+     * @param chapter3 live audio third chapter
+     * @return LiveAudio instance
      */
     public LiveAudio add(String name, String chapter1, String chapter2, String chapter3) {
         return add(name, chapter1, chapter2).setChapter3(chapter3);
@@ -101,7 +104,7 @@ public LiveAudio add(String name, String chapter1, String chapter2, String chapt
     /**
      * Remove a live audio
      *
-     * @param name String
+     * @param name live audio name
      */
     public void remove(String name) {
         int length = list.size();
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/LiveVideo.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/LiveVideo.java
index 93293d8c..c1987111 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/LiveVideo.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/LiveVideo.java
@@ -22,13 +22,22 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
+/**
+ * Wrapper class for live video tracking
+ */
 public class LiveVideo extends RichMedia {
 
+    LiveVideo(MediaPlayer player) {
+        super(player);
+        broadcastMode = BroadcastMode.Live;
+        type = "video";
+    }
+
     /**
      * Set a new name
      *
-     * @param name String
-     * @return LiveAudio
+     * @param name /
+     * @return LiveVideo instance
      */
     public LiveVideo setName(String name) {
         this.name = name;
@@ -38,8 +47,8 @@ public LiveVideo setName(String name) {
     /**
      * Set a new level2
      *
-     * @param level2 int
-     * @return LiveAudio
+     * @param level2 /
+     * @return LiveVideo instance
      */
     public LiveVideo setLevel2(int level2) {
         this.level2 = level2;
@@ -48,10 +57,10 @@ public LiveVideo setLevel2(int level2) {
     }
 
     /**
-     * Change boolean isBuffering value
+     * Change boolean "isBuffering" value
      *
-     * @param isBuffering boolean
-     * @return LiveVideo
+     * @param isBuffering /
+     * @return LiveVideo instance
      */
     public LiveVideo setBuffering(boolean isBuffering) {
         this.isBuffering = isBuffering;
@@ -60,10 +69,10 @@ public LiveVideo setBuffering(boolean isBuffering) {
     }
 
     /**
-     * Change boolean isEmbedded value
+     * Change boolean "isEmbedded" value
      *
-     * @param isEmbedded boolean
-     * @return LiveVideo
+     * @param isEmbedded /
+     * @return LiveVideo instance
      */
     public LiveVideo setEmbedded(boolean isEmbedded) {
         this.isEmbedded = isEmbedded;
@@ -74,8 +83,8 @@ public LiveVideo setEmbedded(boolean isEmbedded) {
     /**
      * Set a new first chapter
      *
-     * @param chapter1 String
-     * @return LiveVideo
+     * @param chapter1 /
+     * @return LiveVideo instance
      */
     public LiveVideo setChapter1(String chapter1) {
         this.chapter1 = chapter1;
@@ -85,8 +94,8 @@ public LiveVideo setChapter1(String chapter1) {
     /**
      * Set a new second chapter
      *
-     * @param chapter2 String
-     * @return LiveVideo
+     * @param chapter2 /
+     * @return LiveVideo instance
      */
     public LiveVideo setChapter2(String chapter2) {
         this.chapter2 = chapter2;
@@ -96,8 +105,8 @@ public LiveVideo setChapter2(String chapter2) {
     /**
      * Set a new third chapter
      *
-     * @param chapter3 String
-     * @return LiveVideo
+     * @param chapter3 /
+     * @return LiveVideo instance
      */
     public LiveVideo setChapter3(String chapter3) {
         this.chapter3 = chapter3;
@@ -107,8 +116,8 @@ public LiveVideo setChapter3(String chapter3) {
     /**
      * Set a new action
      *
-     * @param action RichMedia.Action
-     * @return LiveVideo
+     * @param action /
+     * @return LiveVideo instance
      */
     public LiveVideo setAction(Action action) {
         this.action = action;
@@ -119,17 +128,11 @@ public LiveVideo setAction(Action action) {
     /**
      * Set a new webdomain
      *
-     * @param webDomain String
-     * @return LiveVideo
+     * @param webDomain /
+     * @return LiveVideo instance
      */
     public LiveVideo setWebDomain(String webDomain) {
         this.webDomain = webDomain;
         return this;
     }
-
-    LiveVideo(MediaPlayer player) {
-        super(player);
-        broadcastMode = BroadcastMode.Live;
-        type = "video";
-    }
 }
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/LiveVideos.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/LiveVideos.java
index 92bbeca0..8dc0e05d 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/LiveVideos.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/LiveVideos.java
@@ -24,6 +24,9 @@ of this software and associated documentation files (the "Software"), to deal
 
 import java.util.ArrayList;
 
+/**
+ * Wrapper class to LiveVideo instances
+ */
 public class LiveVideos {
 
     final ArrayList<LiveVideo> list = new ArrayList<>();
@@ -36,8 +39,8 @@ public class LiveVideos {
     /**
      * Create new video
      *
-     * @param name String
-     * @return LiveVideo
+     * @param name live video name
+     * @return LiveVideo instance
      */
     public LiveVideo add(String name) {
         int index = -1;
@@ -65,9 +68,9 @@ public LiveVideo add(String name) {
     /**
      * Create new video
      *
-     * @param name     String
-     * @param chapter1 String
-     * @return LiveVideo
+     * @param name     live video name
+     * @param chapter1 live video first chapter
+     * @return LiveVideo instance
      */
     public LiveVideo add(String name, String chapter1) {
         return add(name).setChapter1(chapter1);
@@ -76,10 +79,10 @@ public LiveVideo add(String name, String chapter1) {
     /**
      * Create new video
      *
-     * @param name     String
-     * @param chapter1 String
-     * @param chapter2 String
-     * @return LiveVideo
+     * @param name     live video name
+     * @param chapter1 live video first chapter
+     * @param chapter2 live video second chapter
+     * @return LiveVideo instance
      */
     public LiveVideo add(String name, String chapter1, String chapter2) {
         return add(name, chapter1).setChapter2(chapter2);
@@ -88,11 +91,11 @@ public LiveVideo add(String name, String chapter1, String chapter2) {
     /**
      * Create new video
      *
-     * @param name     String
-     * @param chapter1 String
-     * @param chapter2 String
-     * @param chapter3 String
-     * @return LiveVideo
+     * @param name     live video name
+     * @param chapter1 live video first chapter
+     * @param chapter2 live video second chapter
+     * @param chapter3 live video third chapter
+     * @return LiveVideo instance
      */
     public LiveVideo add(String name, String chapter1, String chapter2, String chapter3) {
         return add(name, chapter1, chapter2).setChapter3(chapter3);
@@ -101,7 +104,7 @@ public LiveVideo add(String name, String chapter1, String chapter2, String chapt
     /**
      * Remove a live video
      *
-     * @param name String
+     * @param name live video name
      */
     public void remove(String name) {
         int length = list.size();
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Location.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Location.java
index 3c4fec01..98215a21 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Location.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Location.java
@@ -24,6 +24,9 @@ of this software and associated documentation files (the "Software"), to deal
 
 import java.text.DecimalFormat;
 
+/**
+ * Wrapper class for gps location tracking
+ */
 public class Location extends ScreenInfo {
 
     private static final String DECIMAL_FORMAT = "#.00";
@@ -31,43 +34,50 @@ public class Location extends ScreenInfo {
     private double latitude;
     private double longitude;
 
+    Location(Tracker tracker) {
+        super(tracker);
+        latitude = -1.;
+        longitude = -1.;
+    }
+
     /**
-     * Get the latitude
+     * Get the latitude value
      *
-     * @return double
+     * @return the latitude value
      */
     public double getLatitude() {
         return latitude;
     }
 
     /**
-     * Get the longitude
+     * Get the longitude value
      *
-     * @return double
+     * @return the longitude value
      */
     public double getLongitude() {
         return longitude;
     }
 
-    Location setLatitude(double latitude) {
+    /**
+     * Set a new latitude
+     *
+     * @param latitude /
+     * @return Location instance
+     */
+    public Location setLatitude(double latitude) {
         this.latitude = latitude;
         return this;
     }
 
-    Location setLongitude(double longitude) {
-        this.longitude = longitude;
-        return this;
-    }
-
     /**
-     * Constructor
+     * Set a new longitude
      *
-     * @param tracker Tracker
+     * @param longitude /
+     * @return Location instance
      */
-    Location(Tracker tracker) {
-        super(tracker);
-        latitude = -1.;
-        longitude = -1.;
+    public Location setLongitude(double longitude) {
+        this.longitude = longitude;
+        return this;
     }
 
     @Override
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Locations.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Locations.java
index 4d7c9801..d28f6b97 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Locations.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Locations.java
@@ -23,16 +23,13 @@ of this software and associated documentation files (the "Software"), to deal
 package com.atinternet.tracker;
 
 /**
+ * Wrapper class to Location instances
+ *
  * @deprecated Since 2.3.0, Location is now only available as a screen object property.
  */
 @Deprecated
 public class Locations extends Helper {
 
-    /**
-     * Constructor
-     *
-     * @param tracker Tracker
-     */
     Locations(Tracker tracker) {
         super(tracker);
     }
@@ -40,9 +37,9 @@ public class Locations extends Helper {
     /**
      * Add a location
      *
-     * @param latitude  double
-     * @param longitude double
-     * @return Location
+     * @param latitude  latitude value
+     * @param longitude longitude value
+     * @return Location instance
      */
     public Location add(double latitude, double longitude) {
         Location loc = new Location(tracker)
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/MediaPlayer.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/MediaPlayer.java
index 525dd3fa..dded6213 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/MediaPlayer.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/MediaPlayer.java
@@ -22,6 +22,9 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
+/**
+ * Wrapper class to manage rich media tracking
+ */
 public class MediaPlayer {
 
     private final Tracker tracker;
@@ -31,68 +34,68 @@ public class MediaPlayer {
     private LiveVideos liveVideos;
     private LiveAudios liveAudios;
 
+    Tracker getTracker() {
+        return tracker;
+    }
+
+    MediaPlayer(Tracker tracker) {
+        this.tracker = tracker;
+        playerId = 1;
+    }
+
     /**
-     * Get Videos
+     * Get Videos instance
      *
-     * @return Videos
+     * @return the Videos instance
      */
     public Videos Videos() {
         return videos == null ? (videos = new Videos(this)) : videos;
     }
 
     /**
-     * Get Audios
+     * Get Audios instance
      *
-     * @return Audios
+     * @return the Audios instance
      */
     public Audios Audios() {
         return audios == null ? (audios = new Audios(this)) : audios;
     }
 
     /**
-     * Get LiveVideos
+     * Get LiveVideos instance
      *
-     * @return LiveVideos
+     * @return the LiveVideos instance
      */
     public LiveVideos LiveVideos() {
         return liveVideos == null ? (liveVideos = new LiveVideos(this)) : liveVideos;
     }
 
     /**
-     * Get LiveAudios
+     * Get LiveAudios instance
      *
-     * @return LiveAudios
+     * @return the LiveAudios instance
      */
     public LiveAudios LiveAudios() {
         return liveAudios == null ? (liveAudios = new LiveAudios(this)) : liveAudios;
     }
 
-    Tracker getTracker() {
-        return tracker;
-    }
-
     /**
-     * Get the player id
+     * Get the player identifier
      *
-     * @return int
+     * @return the player identifier
      */
     public int getPlayerId() {
         return playerId;
     }
 
     /**
-     * Set a new player id
+     * Set a new player identifier
      *
-     * @param playerId int
-     * @return MediaPlayer
+     * @param playerId player identifier
+     * @return the MediaPlayer instance
      */
     public MediaPlayer setPlayerId(int playerId) {
         this.playerId = playerId;
         return this;
     }
-
-    MediaPlayer(Tracker tracker) {
-        this.tracker = tracker;
-        playerId = 1;
-    }
 }
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/MediaPlayers.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/MediaPlayers.java
index 9e547d13..f91f8767 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/MediaPlayers.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/MediaPlayers.java
@@ -24,6 +24,9 @@ of this software and associated documentation files (the "Software"), to deal
 
 import java.util.TreeMap;
 
+/**
+ * Wrapper class to manage MediaPlayer instances
+ */
 public class MediaPlayers extends Helper {
 
     final TreeMap<Integer, MediaPlayer> players;
@@ -36,7 +39,7 @@ public class MediaPlayers extends Helper {
     /**
      * Add a player
      *
-     * @return Player
+     * @return a new MediaPlayer instance
      */
     public MediaPlayer add() {
         int id = 0;
@@ -49,8 +52,8 @@ public MediaPlayer add() {
     /**
      * Add a player
      *
-     * @param playerId int
-     * @return Player
+     * @param playerId player identifier
+     * @return a new MediaPlayer instance
      */
     public MediaPlayer add(int playerId) {
         if (players.get(playerId) == null) {
@@ -66,9 +69,9 @@ public MediaPlayer add(int playerId) {
     }
 
     /**
-     * Remove a playerId
+     * Remove a MediaPlayer with all media attached
      *
-     * @param playerId int
+     * @param playerId player identifier
      */
     public void remove(int playerId) {
         MediaPlayer player = players.remove(playerId);
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/NuggAd.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/NuggAd.java
index 828c8f2d..ac91165e 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/NuggAd.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/NuggAd.java
@@ -28,6 +28,9 @@ of this software and associated documentation files (the "Software"), to deal
 import java.util.ArrayList;
 import java.util.Arrays;
 
+/**
+ * Wrapper class to enable NuggAd partner usage
+ */
 public class NuggAd extends BusinessObject {
 
     private JSONObject nuggAdData;
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/NuggAds.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/NuggAds.java
index c93dc5af..8dae6183 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/NuggAds.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/NuggAds.java
@@ -24,6 +24,9 @@ of this software and associated documentation files (the "Software"), to deal
 
 import org.json.JSONObject;
 
+/**
+ * Wrapper class to manage NuggAd instances
+ */
 public class NuggAds extends Helper {
 
     NuggAds(Tracker tracker) {
@@ -31,10 +34,10 @@ public class NuggAds extends Helper {
     }
 
     /**
-     * Add a nuggAd
+     * Add a nuggAd object data
      *
-     * @param nuggAdData JSONObject
-     * @return NuggAd
+     * @param nuggAdData /
+     * @return a new NuggAd instance
      */
     public NuggAd add(JSONObject nuggAdData) {
         NuggAd nuggAd = new NuggAd(tracker).setNuggAdData(nuggAdData);
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Offline.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Offline.java
index 05b44260..f3b8b16d 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Offline.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Offline.java
@@ -25,6 +25,9 @@ of this software and associated documentation files (the "Software"), to deal
 import java.util.ArrayList;
 import java.util.Date;
 
+/**
+ * Wrapper class to manage offline hits stored
+ */
 public class Offline {
 
     private final Storage storage;
@@ -36,61 +39,61 @@ public class Offline {
     }
 
     /**
-     * Get offline hits
+     * Get stored hits
      *
-     * @return ArrayList
+     * @return stored hits list
      */
     public ArrayList<Hit> get() {
         return storage.getOfflineHits();
     }
 
     /**
-     * Get the count of offline hits
+     * Get the count of stored hits
      *
-     * @return int
+     * @return the count of stored hits
      */
     public int count() {
         return storage.getCountOfflineHits();
     }
 
     /**
-     * Remove all offline hits
+     * Remove all stored hits
      */
     public void delete() {
         storage.removeAllOfflineHits();
     }
 
     /**
-     * Get the first offline hit
+     * Get the first stored hit
      *
-     * @return OfflineHit
+     * @return the oldest stored hit instance
      */
     public Hit oldest() {
         return storage.getOldestOfflineHit();
     }
 
     /**
-     * Get the last offline hit
+     * Get the last stored hit
      *
-     * @return OfflineHit
+     * @return the latest stored hit instance
      */
     public Hit latest() {
         return storage.getLatestOfflineHit();
     }
 
     /**
-     * Remove offline hits older than days count parameter
+     * Remove stored hits older than days count parameter
      *
-     * @param daysCount int
+     * @param daysCount /
      */
     public void delete(int daysCount) {
         storage.removeOldOfflineHits(daysCount);
     }
 
     /**
-     * Remove offline hits older than a date
+     * Remove stored hits older than a date
      *
-     * @param date Date
+     * @param date /
      */
     public void delete(Date date) {
         int daysCount = Tool.getDaysBetweenTimes(System.currentTimeMillis(), date.getTime());
@@ -98,7 +101,7 @@ public void delete(Date date) {
     }
 
     /**
-     * Send all hits from database
+     * Send all hits stored
      */
     public void dispatch() {
         Sender.sendOfflineHits(listener, storage, true, true);
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/OnAppAd.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/OnAppAd.java
index 9341d728..7fc3393a 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/OnAppAd.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/OnAppAd.java
@@ -22,13 +22,24 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
+/**
+ * Abstract class to manage advertising tracking
+ */
 public abstract class OnAppAd extends BusinessObject {
 
+    Action action;
+
     /**
      * Enum with different advertisement type
      */
     public enum Action {
+        /**
+         * Ad Tracking impression
+         */
         View("ati"),
+        /**
+         * Ad Tracking touch
+         */
         Touch("atc");
 
         private final String str;
@@ -40,21 +51,20 @@ public enum Action {
         public String stringValue() {
             return str;
         }
-    }
 
-    Action action;
+    }
 
     /**
      * Get action type
      *
-     * @return OnAppAd.Action
+     * @return the action type
      */
     public Action getAction() {
         return action;
     }
 
     /**
-     * Send this impression
+     * Send the ad impression event
      */
     public void sendImpression() {
         action = Action.View;
@@ -62,7 +72,7 @@ public void sendImpression() {
     }
 
     /**
-     * Send this touch
+     * Send the ad touch event
      */
     public void sendTouch() {
         action = Action.Touch;
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Order.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Order.java
index c537cef6..f180ff96 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Order.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Order.java
@@ -22,6 +22,9 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
+/**
+ * Wrapper class to manage SalesTracker order feature
+ */
 public class Order extends BusinessObject {
 
     private String orderId;
@@ -39,101 +42,111 @@ OrderCustomVars getCustomVariables() {
         return customVariables;
     }
 
+    Order(Tracker tracker) {
+        super(tracker);
+        orderId = "";
+        turnover = -1.0;
+        status = -1;
+        paymentMethod = -1;
+        newCustomer = false;
+        confirmationRequired = false;
+    }
+
     /**
-     * Get discount object
+     * Get order discount object
      *
-     * @return OrderDiscount
+     * @return OrderDiscount instance
      */
     public OrderDiscount Discount() {
         return orderDiscount == null ? (orderDiscount = new OrderDiscount(this)) : orderDiscount;
     }
 
     /**
-     * Get amount object
+     * Get order amount object
      *
-     * @return OrderAmount
+     * @return OrderAmount instance
      */
     public OrderAmount Amount() {
         return orderAmount == null ? (orderAmount = new OrderAmount(this)) : orderAmount;
     }
 
     /**
-     * Get delivery object
+     * Get order delivery object
      *
-     * @return OrderDelivery
+     * @return OrderDelivery instance
      */
     public OrderDelivery Delivery() {
         return orderDelivery == null ? (orderDelivery = new OrderDelivery(this)) : orderDelivery;
     }
 
     /**
-     * Get CustomVars
+     * Get order custom variables
      *
-     * @return OrderCustomVars
+     * @return OrderCustomVars instance
      */
     public OrderCustomVars CustomVars() {
         return customVariables = (customVariables == null) ? new OrderCustomVars() : customVariables;
     }
 
     /**
-     * Get order id
+     * Get order identifier
      *
-     * @return String
+     * @return the order identifier
      */
     public String getOrderId() {
         return orderId;
     }
 
     /**
-     * Get turnover
+     * Get order turnover
      *
-     * @return double
+     * @return the order turnover
      */
     public double getTurnover() {
         return turnover;
     }
 
     /**
-     * Get status
+     * Get order status
      *
-     * @return int
+     * @return the order status
      */
     public int getStatus() {
         return status;
     }
 
     /**
-     * Get boolean newCustomer value
+     * Get boolean "newCustomer" value
      *
-     * @return boolean
+     * @return true if it's a new customer
      */
     public boolean isNewCustomer() {
         return newCustomer;
     }
 
     /**
-     * Get payment method
+     * Get order payment method
      *
-     * @return int
+     * @return the order payment method
      */
     public int getPaymentMethod() {
         return paymentMethod;
     }
 
     /**
-     * Get boolean confirmationRequired value
+     * Get boolean "confirmationRequired" value
      *
-     * @return boolean
+     * @return true if confirmation is required
      */
     public boolean isConfirmationRequired() {
         return confirmationRequired;
     }
 
     /**
-     * Set a new order id
+     * Set a new order identifier
      *
-     * @param orderId String
-     * @return Order
+     * @param orderId order identifier
+     * @return Order instance
      */
     public Order setOrderId(String orderId) {
         this.orderId = orderId;
@@ -143,8 +156,8 @@ public Order setOrderId(String orderId) {
     /**
      * Set a new turnover
      *
-     * @param turnover double
-     * @return Order
+     * @param turnover /
+     * @return Order instance
      */
     public Order setTurnover(double turnover) {
         this.turnover = turnover;
@@ -154,8 +167,8 @@ public Order setTurnover(double turnover) {
     /**
      * Set a new status
      *
-     * @param status int
-     * @return Order
+     * @param status /
+     * @return Order instance
      */
     public Order setStatus(int status) {
         this.status = status;
@@ -163,10 +176,10 @@ public Order setStatus(int status) {
     }
 
     /**
-     * Change boolean newCustomer value
+     * Change boolean "newCustomer" value
      *
-     * @param newCustomer boolean
-     * @return Order
+     * @param newCustomer /
+     * @return Order instance
      */
     public Order setNewCustomer(boolean newCustomer) {
         this.newCustomer = newCustomer;
@@ -176,8 +189,8 @@ public Order setNewCustomer(boolean newCustomer) {
     /**
      * Set a new payment method
      *
-     * @param paymentMethod int
-     * @return Order
+     * @param paymentMethod /
+     * @return Order instance
      */
     public Order setPaymentMethod(int paymentMethod) {
         this.paymentMethod = paymentMethod;
@@ -185,26 +198,16 @@ public Order setPaymentMethod(int paymentMethod) {
     }
 
     /**
-     * Change boolean confirmationRequired value
+     * Change boolean "confirmationRequired" value
      *
-     * @param confirmationRequired boolean
-     * @return Order
+     * @param confirmationRequired /
+     * @return Order instance
      */
     public Order setConfirmationRequired(boolean confirmationRequired) {
         this.confirmationRequired = confirmationRequired;
         return this;
     }
 
-    Order(Tracker tracker) {
-        super(tracker);
-        orderId = "";
-        turnover = -1.0;
-        status = -1;
-        paymentMethod = -1;
-        newCustomer = false;
-        confirmationRequired = false;
-    }
-
     @Override
     void setEvent() {
 
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/OrderAmount.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/OrderAmount.java
index d3d119b6..33424015 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/OrderAmount.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/OrderAmount.java
@@ -22,6 +22,9 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
+/**
+ * Wrapper class to manage specific order amount feature
+ */
 public class OrderAmount {
 
     private final Order order;
@@ -29,10 +32,17 @@ public class OrderAmount {
     private double amountTaxIncluded;
     private double taxAmount;
 
+    OrderAmount(Order order) {
+        this.order = order;
+        amountTaxFree = -1;
+        amountTaxIncluded = -1;
+        taxAmount = -1;
+    }
+
     /**
      * Get amount tax free
      *
-     * @return double
+     * @return the amount tax free
      */
     public double getAmountTaxFree() {
         return amountTaxFree;
@@ -41,7 +51,7 @@ public double getAmountTaxFree() {
     /**
      * Get amount tax included
      *
-     * @return double
+     * @return the amount tax included
      */
     public double getAmountTaxIncluded() {
         return amountTaxIncluded;
@@ -50,7 +60,7 @@ public double getAmountTaxIncluded() {
     /**
      * Get tax amount
      *
-     * @return double
+     * @return the tax amount
      */
     public double getTaxAmount() {
         return taxAmount;
@@ -59,8 +69,8 @@ public double getTaxAmount() {
     /**
      * Set a new amount tax free
      *
-     * @param amountTaxFree double
-     * @return OrderAmount
+     * @param amountTaxFree /
+     * @return OrderAmount instance
      */
     public OrderAmount setAmountTaxFree(double amountTaxFree) {
         this.amountTaxFree = amountTaxFree;
@@ -70,8 +80,8 @@ public OrderAmount setAmountTaxFree(double amountTaxFree) {
     /**
      * Set a new amount tax included
      *
-     * @param amountTaxIncluded double
-     * @return OrderAmount
+     * @param amountTaxIncluded /
+     * @return OrderAmount instance
      */
     public OrderAmount setAmountTaxIncluded(double amountTaxIncluded) {
         this.amountTaxIncluded = amountTaxIncluded;
@@ -81,28 +91,21 @@ public OrderAmount setAmountTaxIncluded(double amountTaxIncluded) {
     /**
      * Set a new tax amount
      *
-     * @param taxAmount double
-     * @return OrderAmount
+     * @param taxAmount /
+     * @return OrderAmount instance
      */
     public OrderAmount setTaxAmount(double taxAmount) {
         this.taxAmount = taxAmount;
         return this;
     }
 
-    OrderAmount(Order order) {
-        this.order = order;
-        amountTaxFree = -1;
-        amountTaxIncluded = -1;
-        taxAmount = -1;
-    }
-
     /**
-     * Helper to set all properties
+     * Attach amount object to order
      *
-     * @param amountTaxFree     double
-     * @param amountTaxIncluded double
-     * @param taxAmount         double
-     * @return Order
+     * @param amountTaxFree     order amount tax free
+     * @param amountTaxIncluded order amount tax included
+     * @param taxAmount         order amount tax
+     * @return Order instance
      */
     public Order set(double amountTaxFree, double amountTaxIncluded, double taxAmount) {
         setAmountTaxFree(amountTaxFree)
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/OrderCustomVars.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/OrderCustomVars.java
index 83a02f18..2c07dfdf 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/OrderCustomVars.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/OrderCustomVars.java
@@ -24,17 +24,40 @@ of this software and associated documentation files (the "Software"), to deal
 
 import java.util.ArrayList;
 
+/**
+ * Adds custom variables to an order
+ */
 public class OrderCustomVars extends ArrayList<OrderCustomVar> {
 
     /**
      * Add a order custom var
      *
-     * @param varId int
-     * @param value String
-     * @return OrderCustomVars
+     * @param varId int: identifier
+     * @param value String: value
+     * @return OrderCustomVars: the same instance
      */
     public OrderCustomVars add(int varId, String value) {
         super.add(new OrderCustomVar(varId, value));
         return this;
     }
 }
+
+class OrderCustomVar {
+
+    private final int varId;
+
+    private final String value;
+
+    int getVarId() {
+        return varId;
+    }
+
+    String getValue() {
+        return value;
+    }
+
+    OrderCustomVar(int varId, String value) {
+        this.varId = varId;
+        this.value = value;
+    }
+}
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/OrderDelivery.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/OrderDelivery.java
index 1b51b7bf..e6037215 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/OrderDelivery.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/OrderDelivery.java
@@ -22,6 +22,9 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
+/**
+ * Wrapper class to manage specific order delivery feature
+ */
 public class OrderDelivery {
 
     private final Order order;
@@ -29,10 +32,17 @@ public class OrderDelivery {
     private double shippingFeesTaxFree;
     private String deliveryMethod;
 
+    OrderDelivery(Order order) {
+        this.order = order;
+        shippingFeesTaxIncluded = -1;
+        shippingFeesTaxFree = -1;
+        deliveryMethod = null;
+    }
+
     /**
      * Get shipping fees tax included value
      *
-     * @return double
+     * @return the shipping fees tax included value
      */
     public double getShippingFeesTaxIncluded() {
         return shippingFeesTaxIncluded;
@@ -41,7 +51,7 @@ public double getShippingFeesTaxIncluded() {
     /**
      * Get shipping fess tax free value
      *
-     * @return double
+     * @return the shipping fess tax free value
      */
     public double getShippingFeesTaxFree() {
         return shippingFeesTaxFree;
@@ -50,7 +60,7 @@ public double getShippingFeesTaxFree() {
     /**
      * Get delivery method
      *
-     * @return String
+     * @return the delivery method
      */
     public String getDeliveryMethod() {
         return deliveryMethod;
@@ -59,8 +69,8 @@ public String getDeliveryMethod() {
     /**
      * Set a new shipping fees tax included value
      *
-     * @param shippingFeesTaxIncluded double
-     * @return OrderDelivery
+     * @param shippingFeesTaxIncluded /
+     * @return OrderDelivery instance
      */
     public OrderDelivery setShippingFeesTaxIncluded(double shippingFeesTaxIncluded) {
         this.shippingFeesTaxIncluded = shippingFeesTaxIncluded;
@@ -70,8 +80,8 @@ public OrderDelivery setShippingFeesTaxIncluded(double shippingFeesTaxIncluded)
     /**
      * Set a new shipping fees tax free value
      *
-     * @param shippingFeesTaxFree double
-     * @return OrderDeliery
+     * @param shippingFeesTaxFree /
+     * @return OrderDelivery instance
      */
     public OrderDelivery setShippingFeesTaxFree(double shippingFeesTaxFree) {
         this.shippingFeesTaxFree = shippingFeesTaxFree;
@@ -81,28 +91,21 @@ public OrderDelivery setShippingFeesTaxFree(double shippingFeesTaxFree) {
     /**
      * Set a new delivery method
      *
-     * @param deliveryMethod String
-     * @return OrderDelivery
+     * @param deliveryMethod /
+     * @return OrderDelivery instance
      */
     public OrderDelivery setDeliveryMethod(String deliveryMethod) {
         this.deliveryMethod = deliveryMethod;
         return this;
     }
 
-    OrderDelivery(Order order) {
-        this.order = order;
-        shippingFeesTaxIncluded = -1;
-        shippingFeesTaxFree = -1;
-        deliveryMethod = null;
-    }
-
     /**
-     * Helper to set all properties
+     * Attach delivery to order
      *
-     * @param shippingFeesTaxFree     int
-     * @param shippingFeesTaxIncluded double
-     * @param deliveryMethod          String
-     * @return Order
+     * @param shippingFeesTaxFree     order delivery shipping fees tax free
+     * @param shippingFeesTaxIncluded order delivery shipping fees tax included
+     * @param deliveryMethod          order delivery method
+     * @return Order instance
      */
     public Order set(double shippingFeesTaxFree, double shippingFeesTaxIncluded, String deliveryMethod) {
         setShippingFeesTaxFree(shippingFeesTaxFree)
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/OrderDiscount.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/OrderDiscount.java
index 3a478501..c292c645 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/OrderDiscount.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/OrderDiscount.java
@@ -22,6 +22,9 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
+/**
+ * Wrapper class to manage specific order discount feature
+ */
 public class OrderDiscount {
 
     private final Order order;
@@ -29,10 +32,17 @@ public class OrderDiscount {
     private double discountTaxFree;
     private String promotionalCode;
 
+    OrderDiscount(Order order) {
+        this.order = order;
+        discountTaxIncluded = -1;
+        discountTaxFree = -1;
+        promotionalCode = null;
+    }
+
     /**
      * Get promotional code
      *
-     * @return String
+     * @return the promotional code
      */
     public String getPromotionalCode() {
         return promotionalCode;
@@ -41,7 +51,7 @@ public String getPromotionalCode() {
     /**
      * Get discount tax included value
      *
-     * @return double
+     * @return the discount tax included value
      */
     public double getDiscountTaxIncluded() {
         return discountTaxIncluded;
@@ -50,7 +60,7 @@ public double getDiscountTaxIncluded() {
     /**
      * Get discount tax free value
      *
-     * @return double
+     * @return the discount tax free value
      */
     public double getDiscountTaxFree() {
         return discountTaxFree;
@@ -59,8 +69,8 @@ public double getDiscountTaxFree() {
     /**
      * Set a new promotional code
      *
-     * @param promotionalCode String
-     * @return OrderDiscount
+     * @param promotionalCode /
+     * @return OrderDiscount instance
      */
     public OrderDiscount setPromotionalCode(String promotionalCode) {
         this.promotionalCode = promotionalCode;
@@ -70,8 +80,8 @@ public OrderDiscount setPromotionalCode(String promotionalCode) {
     /**
      * Set a new discount tax included value
      *
-     * @param discountTaxIncluded double
-     * @return OrderDiscount
+     * @param discountTaxIncluded /
+     * @return OrderDiscount instance
      */
     public OrderDiscount setDiscountTaxIncluded(double discountTaxIncluded) {
         this.discountTaxIncluded = discountTaxIncluded;
@@ -81,28 +91,21 @@ public OrderDiscount setDiscountTaxIncluded(double discountTaxIncluded) {
     /**
      * Set a new discount tax free value
      *
-     * @param discountTaxFree double
-     * @return OrderDiscount
+     * @param discountTaxFree /
+     * @return OrderDiscount instance
      */
     public OrderDiscount setDiscountTaxFree(double discountTaxFree) {
         this.discountTaxFree = discountTaxFree;
         return this;
     }
 
-    OrderDiscount(Order order) {
-        this.order = order;
-        discountTaxIncluded = -1;
-        discountTaxFree = -1;
-        promotionalCode = null;
-    }
-
     /**
-     * Helper to set all properties
+     * Attach discount to order
      *
-     * @param discountTaxFree     double
-     * @param discountTaxIncluded double
-     * @param promotionalCode     String
-     * @return Order
+     * @param discountTaxFree     order discount tax free
+     * @param discountTaxIncluded order discount tax included
+     * @param promotionalCode     order promotional code
+     * @return Order instance
      */
     public Order set(double discountTaxFree, double discountTaxIncluded, String promotionalCode) {
         setDiscountTaxFree(discountTaxFree)
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Orders.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Orders.java
index a02e3436..6d4ed517 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Orders.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Orders.java
@@ -22,13 +22,11 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
+/**
+ * Wrapper class to manage Order instances
+ */
 public class Orders extends Helper {
 
-    /**
-     * Default constructor
-     *
-     * @param tracker Tracker
-     */
     Orders(Tracker tracker) {
         super(tracker);
     }
@@ -36,9 +34,9 @@ public class Orders extends Helper {
     /**
      * Add an order
      *
-     * @param orderId  String
-     * @param turnover int
-     * @return Order
+     * @param orderId  order identifier
+     * @param turnover order turnover
+     * @return a new Order instance
      */
     public Order add(String orderId, double turnover) {
         Order order = new Order(tracker)
@@ -52,9 +50,9 @@ public Order add(String orderId, double turnover) {
     /**
      * Add an order
      *
-     * @param orderId  String
-     * @param turnover int
-     * @param status   int
+     * @param orderId  order identifier
+     * @param turnover order turnover
+     * @param status   order status (1: "Pending", 2: "Cancelled", 3: "Approved", 4: "Return")
      * @return Order
      */
     public Order add(String orderId, double turnover, int status) {
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Param.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Param.java
deleted file mode 100644
index 2acdd6c5..00000000
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Param.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
-This SDK is licensed under the MIT license (MIT)
-Copyright (c) 2015- Applied Technologies Internet SAS (registration number B 403 261 258 - Trade and Companies Register of Bordeaux – France)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
- */
-package com.atinternet.tracker;
-
-/**
- * Param
- */
-class Param {
-
-    /**
-     * Param type
-     */
-    enum Type {
-        Integer, Double, Float, String, Boolean, Array, JSON, Closure, Unknown
-    }
-
-    /**
-     * Param key
-     */
-    private String key;
-
-    /**
-     * Param value
-     */
-    private Closure value;
-
-    /**
-     * Param type
-     */
-    private Type type;
-
-    /**
-     * Param options
-     */
-    private ParamOption paramOption;
-
-    /**
-     * Get key
-     *
-     * @return String
-     */
-    public String getKey() {
-        return key;
-    }
-
-    /**
-     * Set a new key
-     *
-     * @param key String
-     */
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    /**
-     * Get the value
-     *
-     * @return Closure
-     */
-    public Closure getValue() {
-        return value;
-    }
-
-    /**
-     * Set a new value
-     *
-     * @param value Closure
-     */
-    public void setValue(Closure value) {
-        this.value = value;
-    }
-
-    /**
-     * Get the type
-     *
-     * @return Type
-     */
-    public Type getType() {
-        return type;
-    }
-
-    /**
-     * Set the type
-     *
-     * @param type Type
-     */
-    public void setType(Type type) {
-        this.type = type;
-    }
-
-    /**
-     * Get options
-     *
-     * @return ParamOption
-     */
-    public ParamOption getOptions() {
-        return paramOption;
-    }
-
-    /**
-     * Set new options
-     *
-     * @param paramOption ParamOption
-     */
-    public void setOptions(ParamOption paramOption) {
-        this.paramOption = paramOption;
-    }
-
-    /**
-     * Default constructor
-     */
-    public Param() {
-        key = "";
-        value = null;
-        paramOption = null;
-        type = Type.Unknown;
-    }
-
-    /**
-     * Constructor
-     *
-     * @param key   String
-     * @param value Closure
-     * @param type  Type
-     */
-    public Param(String key, Closure value, Type type) {
-        this();
-        this.key = key;
-        this.value = value;
-        this.type = type;
-    }
-
-    /**
-     * Constructor
-     *
-     * @param key             String
-     * @param value           Closure
-     * @param type            Type
-     * @param paramOption ParamOption
-     */
-    public Param(String key, Closure value, Type type, ParamOption paramOption) {
-        this(key, value, type);
-        this.paramOption = paramOption;
-    }
-}
\ No newline at end of file
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/ParamOption.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/ParamOption.java
index 2fec142f..9f00e04b 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/ParamOption.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/ParamOption.java
@@ -22,13 +22,35 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
+/**
+ * Class to customize parameter options
+ */
 public class ParamOption {
 
     /**
      * Enum for relative position
      */
     public enum RelativePosition {
-        none, first, last, before, after
+        /**
+         * Undefined
+         */
+        none,
+        /**
+         * First parameter
+         */
+        first,
+        /**
+         * Last parameter (/!\ Cannot override the referrer parameter position, it must be the last if it's defined)
+         */
+        last,
+        /**
+         * Before an other parameter (use {@link #setRelativeParameterKey(String)} with that)
+         */
+        before,
+        /**
+         * After an other parameter (use {@link #setRelativeParameterKey(String)} with that)
+         */
+        after
     }
 
     private RelativePosition relativePosition;
@@ -39,54 +61,54 @@ public enum RelativePosition {
     private boolean append;
 
     /**
-     * Get relative position
+     * Get relative position parameter
      *
-     * @return ParamOption.RelativePosition
+     * @return the relative position
      */
     public RelativePosition getRelativePosition() {
         return relativePosition;
     }
 
     /**
-     * Get relative position parameter key
+     * Get parameter key attached with relative position
      *
-     * @return String
+     * @return the parameter key
      */
     public String getRelativeParameterKey() {
         return relativeParameterKey;
     }
 
     /**
-     * Encoding parameter
+     * Get boolean "encode" value
      *
-     * @return boolean
+     * @return true if the parameter must be url encoded
      */
     public boolean isEncode() {
         return encode;
     }
 
     /**
-     * Get separator
+     * Get separator for a parameter with multiple values
      *
-     * @return String
+     * @return values separator
      */
     public String getSeparator() {
         return separator;
     }
 
     /**
-     * Persistent or volatile
+     * Get boolean "persistent" value
      *
-     * @return boolean
+     * @return true if the parameter must be present in all hits during session
      */
     public boolean isPersistent() {
         return persistent;
     }
 
     /**
-     * Get append value
+     * Get boolean "append" value
      *
-     * @return boolean
+     * @return true if parameter should have multiple values
      */
     public boolean isAppend() {
         return append;
@@ -95,8 +117,8 @@ public boolean isAppend() {
     /**
      * Set a new relative position
      *
-     * @param relativePosition ParamOption.RelativePosition
-     * @return ParamOption
+     * @param relativePosition /
+     * @return ParamOption instance
      */
     public ParamOption setRelativePosition(RelativePosition relativePosition) {
         this.relativePosition = relativePosition;
@@ -106,8 +128,8 @@ public ParamOption setRelativePosition(RelativePosition relativePosition) {
     /**
      * Set a new relative position parameter key
      *
-     * @param relativeParameterKey String
-     * @return ParamOption
+     * @param relativeParameterKey /
+     * @return ParamOption instance
      */
     public ParamOption setRelativeParameterKey(String relativeParameterKey) {
         this.relativeParameterKey = relativeParameterKey;
@@ -115,10 +137,10 @@ public ParamOption setRelativeParameterKey(String relativeParameterKey) {
     }
 
     /**
-     * Set encoding
+     * Set a new boolean "encode" value
      *
-     * @param encode boolean
-     * @return ParamOption
+     * @param encode /
+     * @return ParamOption instance
      */
     public ParamOption setEncode(boolean encode) {
         this.encode = encode;
@@ -128,8 +150,8 @@ public ParamOption setEncode(boolean encode) {
     /**
      * Set a new separator
      *
-     * @param separator String
-     * @return ParamOption
+     * @param separator /
+     * @return ParamOption instance
      */
     public ParamOption setSeparator(String separator) {
         this.separator = separator;
@@ -137,10 +159,10 @@ public ParamOption setSeparator(String separator) {
     }
 
     /**
-     * Set persistent value
+     * Set a new boolean "persistent" value
      *
-     * @param isPermanent boolean
-     * @return ParamOption
+     * @param isPermanent /
+     * @return ParamOption instance
      */
     public ParamOption setPersistent(boolean isPermanent) {
         this.persistent = isPermanent;
@@ -148,10 +170,10 @@ public ParamOption setPersistent(boolean isPermanent) {
     }
 
     /**
-     * Set append value
+     * Set a new boolean "append" value
      *
-     * @param append boolean
-     * @return ParamOption
+     * @param append /
+     * @return ParamOption instance
      */
     public ParamOption setAppend(boolean append) {
         this.append = append;
@@ -159,7 +181,7 @@ public ParamOption setAppend(boolean append) {
     }
 
     /**
-     * Init ParamOption
+     * Default constructor
      */
     public ParamOption() {
         relativePosition = RelativePosition.none;
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Plugin.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Plugin.java
index 58533a04..2bc8e596 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Plugin.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Plugin.java
@@ -22,8 +22,27 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
+import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+import java.util.TimeZone;
+
 /**
  * Plugin for partners
  */
@@ -51,7 +70,292 @@ abstract class Plugin {
      *
      * @return String
      */
-    public String getResponse() {
+    String getResponse() {
         return response;
     }
 }
+
+class PluginParam {
+
+    static HashMap<String, String> get(Tracker tracker) {
+        HashMap<String, String> dictionary = new HashMap<>();
+        ArrayList<String> plugins = new ArrayList<>(Arrays.asList(((String) tracker.getConfiguration().get(TrackerConfigurationKeys.PLUGINS)).split(",")));
+
+        if (plugins.contains("tvtracking")) {
+            dictionary.put(Hit.HitParam.TVT.stringValue(), TVTrackingPlugin.class.getName());
+        }
+        return dictionary;
+    }
+}
+
+/**
+ * TVTracking plugin
+ */
+class TVTrackingPlugin extends Plugin {
+
+    /**
+     * Constant timeout
+     */
+    private static final int TIMEOUT = 5000;
+
+    /**
+     * Strings constant
+     */
+    private static final String DIRECT = "direct";
+    private static final String REMANENT = "remanent";
+    private static final String INFO = "info";
+    private static final String VERSION = "version";
+    private static final String VERSION_TVT_CODE = "1.2.2m";
+    private static final String MESSAGE = "message";
+    private static final String ERROR = "errors";
+    private static final String TVTRACKING = "tvtracking";
+    private static final String UNDEFINED = "undefined";
+    private static final String PRIORITY = "priority";
+    private static final String CHANNEL = "channel";
+    private static final String TIME = "time";
+    private static final String LIFETIME = "lifetime";
+
+    private static final String UTC_DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ss'Z'";
+
+    enum TVTrackingStatusCase {
+        channelUndefined, noChannel, noData, timeError, ok
+    }
+
+    @Override
+    protected void execute(Tracker tracker) {
+        this.tracker = tracker;
+        try {
+            if (sessionIsExpired()) {
+                setDirectCampaignToRemanent();
+
+                URL url = new URL(tracker.TVTracking().getCampaignURL());
+                HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+                connection.setReadTimeout(TIMEOUT);
+                connection.setConnectTimeout(TIMEOUT);
+                connection.setDoInput(true);
+                connection.connect();
+                response = getTvTrackingResponse(stringifyTvTResponse(connection), connection);
+                connection.disconnect();
+            } else {
+                response = getTvTrackingResponse(Tracker.getPreferences().getString(TrackerConfigurationKeys.DIRECT_CAMPAIGN_SAVED, null), null);
+            }
+            Tool.executeCallback(tracker.getListener(), Tool.CallbackType.partner, "TV Tracking : " + response);
+            Tracker.getPreferences().edit().putLong(TrackerConfigurationKeys.LAST_TVT_EXECUTE_TIME, System.currentTimeMillis()).apply();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Formatting data from HTTPResponse content
+     *
+     * @param connection HttpURLConnection
+     * @return String
+     */
+    private String stringifyTvTResponse(HttpURLConnection connection) throws IOException {
+        String result = null;
+        if (connection.getResponseCode() == 200) {
+            InputStream inputStream = connection.getInputStream();
+            if (inputStream != null) {
+                result = "";
+                BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
+                String line;
+                while ((line = reader.readLine()) != null) {
+                    result += line;
+                }
+                inputStream.close();
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Get formatted JSON TVTracking response
+     *
+     * @param directCampaign String
+     * @param connection     HttpURLConnection
+     * @return String
+     * @throws JSONException
+     */
+    private String getTvTrackingResponse(String directCampaign, HttpURLConnection connection) throws JSONException, IOException {
+        JSONObject resultJson = new JSONObject();
+
+        JSONObject tvtrackingObject = new JSONObject();
+        JSONObject infoObject;
+        String infoSaved = Tracker.getPreferences().getString(TrackerConfigurationKeys.INFO_CAMPAIGN_SAVED, null);
+
+        // if tvt send data
+        if (directCampaign != null) {
+            Object[] checkResult = checkCampaign(new JSONObject(directCampaign));
+            switch ((TVTrackingStatusCase) checkResult[0]) {
+                case noChannel:
+                    // invalid data
+                    infoObject = putInfos(infoSaved, TVTrackingStatusCase.noChannel, connection, null);
+                    break;
+                case channelUndefined:
+                    // no diffusion
+                    infoObject = putInfos(infoSaved, TVTrackingStatusCase.channelUndefined, connection, null);
+                    break;
+                case timeError:
+                    // Bad time
+                    infoObject = putInfos(infoSaved, TVTrackingStatusCase.timeError, connection, checkResult);
+                    break;
+                default:
+                    // valid campaign
+                    JSONObject directObject = (JSONObject) checkResult[1];
+                    Tracker.getPreferences().edit().putString(TrackerConfigurationKeys.DIRECT_CAMPAIGN_SAVED, directObject.toString()).apply();
+                    tvtrackingObject.put(DIRECT, directObject);
+                    infoObject = putInfos(infoSaved, TVTrackingStatusCase.ok, connection, checkResult);
+                    break;
+            }
+        } else {
+            infoObject = putInfos(infoSaved, TVTrackingStatusCase.noData, connection, null);
+        }
+        Tracker.getPreferences().edit().putString(TrackerConfigurationKeys.INFO_CAMPAIGN_SAVED, infoObject.toString()).apply();
+
+        String remanentCampaignSaved = Tracker.getPreferences().getString(TrackerConfigurationKeys.REMANENT_CAMPAIGN_SAVED, null);
+        if (remanentCampaignSaved != null) {
+            JSONObject remanentObject = new JSONObject(remanentCampaignSaved);
+            tvtrackingObject.put(REMANENT, remanentObject);
+        }
+
+        tvtrackingObject.put(INFO, infoObject);
+        return resultJson.put(TVTRACKING, tvtrackingObject).toString();
+    }
+
+    /**
+     * Set direct campaign to remanent campaignt
+     *
+     * @throws JSONException
+     */
+    private void setDirectCampaignToRemanent() throws JSONException {
+        String directCampaign = Tracker.getPreferences().getString(TrackerConfigurationKeys.DIRECT_CAMPAIGN_SAVED, null);
+        if (directCampaign != null) {
+            JSONObject directObject = new JSONObject(directCampaign);
+            String remanentCampaign = Tracker.getPreferences().getString(TrackerConfigurationKeys.REMANENT_CAMPAIGN_SAVED, null);
+            if (remanentCampaign != null) {
+                JSONObject remanentObject = new JSONObject(remanentCampaign);
+                int directPriority;
+                int remanentPriority;
+                if (directObject.get(PRIORITY) instanceof String) {
+                    directPriority = Integer.parseInt((String) directObject.get(PRIORITY));
+                } else {
+                    directPriority = (Integer) directObject.get(PRIORITY);
+                }
+                if (remanentObject.get(PRIORITY) instanceof String) {
+                    remanentPriority = Integer.parseInt((String) remanentObject.get(PRIORITY));
+                } else {
+                    remanentPriority = (Integer) remanentObject.get(PRIORITY);
+                }
+                if (directPriority == 1 || (directPriority == 0 && remanentPriority == 1)) {
+                    Tracker.getPreferences().edit().putString(TrackerConfigurationKeys.REMANENT_CAMPAIGN_SAVED, directCampaign).apply();
+                }
+            } else {
+                Tracker.getPreferences().edit().putString(TrackerConfigurationKeys.REMANENT_CAMPAIGN_SAVED, directCampaign).apply();
+            }
+            Tracker.getPreferences().edit().putLong(TrackerConfigurationKeys.REMANENT_CAMPAIGN_TIME_SAVED, System.currentTimeMillis())
+                    .putString(TrackerConfigurationKeys.DIRECT_CAMPAIGN_SAVED, null)
+                    .apply();
+        }
+        Tracker.getPreferences().edit().putString(TrackerConfigurationKeys.INFO_CAMPAIGN_SAVED, null).apply();
+    }
+
+    /**
+     * Check if campaign is valid
+     *
+     * @param response JSONObject
+     * @return JSONObject
+     * @throws JSONException
+     */
+    private Object[] checkCampaign(JSONObject response) throws JSONException {
+        // invalid data
+        if (!response.toString().contains(CHANNEL)) {
+            return new Object[]{TVTrackingStatusCase.noChannel, null};
+        }
+        // no diffusion
+        else if (response.get(CHANNEL).equals(UNDEFINED)) {
+            return new Object[]{TVTrackingStatusCase.channelUndefined, null};
+        } else {
+            if (response.get(PRIORITY).equals(UNDEFINED)) {
+                response.put(PRIORITY, "1");
+            }
+            if (response.get(LIFETIME).equals(UNDEFINED)) {
+                response.put(LIFETIME, "30");
+            }
+
+            String partnerTime = (String) response.get(TIME);
+            SimpleDateFormat sdf;
+            Date date = null;
+
+            // UTC
+            try {
+                sdf = new SimpleDateFormat(UTC_DATE_FORMAT, Locale.getDefault());
+                sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
+                date = sdf.parse(partnerTime);
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+
+            if (date == null || Tool.getMinutesBetweenTimes(System.currentTimeMillis(), date.getTime()) > Integer.parseInt(String.valueOf(tracker.getConfiguration().get(TrackerConfigurationKeys.TVTRACKING_SPOT_VALIDITY_TIME)))) {
+                return new Object[]{TVTrackingStatusCase.timeError, partnerTime};
+            }
+        }
+        return new Object[]{TVTrackingStatusCase.ok, response};
+    }
+
+    /**
+     * Return true if session is expired
+     *
+     * @return boolean
+     */
+    private boolean sessionIsExpired() {
+        long lastHitSentTime = Tracker.getPreferences().getLong(TrackerConfigurationKeys.LAST_TVT_EXECUTE_TIME, 0);
+        return Tool.getSecondsBetweenTimes(System.currentTimeMillis(), lastHitSentTime) >= tracker.TVTracking().getVisitDuration() * 60;
+    }
+
+    /**
+     * Insert info object in tvt response
+     *
+     * @param infoSaved  String
+     * @param status     TVTrackingStatusCase
+     * @param connection HttpURLConnection
+     * @return JSONObject
+     * @throws JSONException
+     */
+    private JSONObject putInfos(String infoSaved, TVTrackingStatusCase status, HttpURLConnection connection, Object[] checkResult) throws JSONException, IOException {
+        // if session is not expired
+        if (infoSaved != null) {
+            return new JSONObject(infoSaved);
+        } else {
+            JSONObject infoObject = new JSONObject();
+            switch (status) {
+                case noChannel:
+                    // No channel
+                    return infoObject.put(VERSION, VERSION_TVT_CODE)
+                            .put(MESSAGE, String.valueOf(connection.getResponseCode()))
+                            .put(ERROR, "noChannel");
+                case channelUndefined:
+                    // Invalid campaign
+                    return infoObject.put(VERSION, VERSION_TVT_CODE)
+                            .put(MESSAGE, String.valueOf(connection.getResponseCode()) + "-channelUndefined")
+                            .put(ERROR, "");
+                case noData:
+                    // No campaign
+                    return infoObject.put(VERSION, VERSION_TVT_CODE)
+                            .put(MESSAGE, String.valueOf(connection.getResponseCode()))
+                            .put(ERROR, "noData");
+                case timeError:
+                    // Bad time
+                    return infoObject.put(VERSION, VERSION_TVT_CODE)
+                            .put(MESSAGE, String.valueOf(connection.getResponseCode()) + "-" + String.valueOf(checkResult[1]))
+                            .put(ERROR, "timeError");
+                default:
+                    // Valid campaign
+                    return infoObject.put(VERSION, VERSION_TVT_CODE)
+                            .put(MESSAGE, String.valueOf(connection.getResponseCode()))
+                            .put(ERROR, "");
+            }
+        }
+    }
+}
+
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/PluginParam.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/PluginParam.java
deleted file mode 100644
index 8b158181..00000000
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/PluginParam.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-This SDK is licensed under the MIT license (MIT)
-Copyright (c) 2015- Applied Technologies Internet SAS (registration number B 403 261 258 - Trade and Companies Register of Bordeaux – France)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
- */
-package com.atinternet.tracker;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-
-/**
- * Get plugins collection
- */
-class PluginParam {
-
-    /**
-     * Get a map
-     *
-     * @param tracker Tracker
-     * @return HashMap
-     */
-    static HashMap<String, String> get(Tracker tracker) {
-        HashMap<String, String> dictionary = new HashMap<>();
-        ArrayList<String> plugins = new ArrayList<>(Arrays.asList(((String) tracker.getConfiguration().get(TrackerConfigurationKeys.PLUGINS)).split(",")));
-
-        if (plugins.contains("tvtracking")) {
-            dictionary.put(Hit.HitParam.TVT.stringValue(), TVTrackingPlugin.class.getName());
-        }
-        return dictionary;
-    }
-}
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Product.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Product.java
index 3c0f470d..912dfbc6 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Product.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Product.java
@@ -24,6 +24,9 @@ of this software and associated documentation files (the "Software"), to deal
 
 import java.util.LinkedHashMap;
 
+/**
+ * Wrapper class to manage product for SalesTracker or viewed products tracking
+ */
 public class Product extends BusinessObject {
 
     /**
@@ -65,73 +68,79 @@ LinkedHashMap<String, CustomObject> getCustomObjectsMap() {
         return customObjectsMap == null ? (customObjectsMap = new LinkedHashMap<>()) : customObjectsMap;
     }
 
+    Product(Tracker tracker) {
+        super(tracker);
+        action = Action.View;
+        productId = "";
+    }
+
     /**
      * Get action
      *
-     * @return Product.Action
+     * @return the action type
      */
     public Action getAction() {
         return action;
     }
 
     /**
-     * Get product id
+     * Get product identifier
      *
-     * @return String
+     * @return the product identifier
      */
     public String getProductId() {
         return productId;
     }
 
     /**
-     * Get first category
+     * Get product first category
      *
-     * @return String
+     * @return the product first category
      */
     public String getCategory1() {
         return category1;
     }
 
     /**
-     * Get second category
+     * Get product second category
      *
-     * @return String
+     * @return the product second category
      */
     public String getCategory2() {
         return category2;
     }
 
     /**
-     * Get third category
+     * Get product third category
      *
-     * @return String
+     * @return the product third category
      */
     public String getCategory3() {
         return category3;
     }
 
     /**
-     * Get fourth category
+     * Get product fourth category
      *
-     * @return String
+     * @return the product fourth category
      */
     public String getCategory4() {
         return category4;
     }
 
     /**
-     * Get fifth category
+     * Get product fifth category
      *
-     * @return String
+     * @return the product fifth category
      */
     public String getCategory5() {
         return category5;
     }
 
     /**
-     * Get sixth category
+     * Get product sixth category
      *
-     * @return String
+     * @return the product sixth category
      */
     public String getCategory6() {
         return category6;
@@ -140,7 +149,7 @@ public String getCategory6() {
     /**
      * Get quantity
      *
-     * @return int
+     * @return the product quantity
      */
     public int getQuantity() {
         return quantity;
@@ -149,7 +158,7 @@ public int getQuantity() {
     /**
      * Get unit price tax included value
      *
-     * @return double
+     * @return the product unit price tax included value
      */
     public double getUnitPriceTaxIncluded() {
         return unitPriceTaxIncluded;
@@ -158,7 +167,7 @@ public double getUnitPriceTaxIncluded() {
     /**
      * Get unit price tax free value
      *
-     * @return double
+     * @return the product unit price tax free value
      */
     public double getUnitPriceTaxFree() {
         return unitPriceTaxFree;
@@ -167,7 +176,7 @@ public double getUnitPriceTaxFree() {
     /**
      * Get discount tax included value
      *
-     * @return double
+     * @return the product discount tax included value
      */
     public double getDiscountTaxIncluded() {
         return discountTaxIncluded;
@@ -176,7 +185,7 @@ public double getDiscountTaxIncluded() {
     /**
      * Get discount tax free value
      *
-     * @return double
+     * @return the product discount tax free value
      */
     public double getDiscountTaxFree() {
         return discountTaxFree;
@@ -185,7 +194,7 @@ public double getDiscountTaxFree() {
     /**
      * Get promotional code
      *
-     * @return String
+     * @return the product promotional code
      */
     public String getPromotionalCode() {
         return promotionalCode;
@@ -194,8 +203,8 @@ public String getPromotionalCode() {
     /**
      * Set a new action
      *
-     * @param action Product.Action
-     * @return Product
+     * @param action /
+     * @return Product instance
      */
     public Product setAction(Action action) {
         this.action = action;
@@ -203,10 +212,10 @@ public Product setAction(Action action) {
     }
 
     /**
-     * Set a new product id
+     * Set a new product identifier
      *
-     * @param productId String
-     * @return Product
+     * @param productId product identifier
+     * @return Product instance
      */
     public Product setProductId(String productId) {
         this.productId = productId;
@@ -216,8 +225,8 @@ public Product setProductId(String productId) {
     /**
      * Set a new first category
      *
-     * @param category1 String
-     * @return Product
+     * @param category1 /
+     * @return Product instance
      */
     public Product setCategory1(String category1) {
         this.category1 = category1;
@@ -227,8 +236,8 @@ public Product setCategory1(String category1) {
     /**
      * Set a new second category
      *
-     * @param category2 String
-     * @return Product
+     * @param category2 /
+     * @return Product instance
      */
     public Product setCategory2(String category2) {
         this.category2 = category2;
@@ -238,8 +247,8 @@ public Product setCategory2(String category2) {
     /**
      * Set a new third category
      *
-     * @param category3 String
-     * @return Product
+     * @param category3 /
+     * @return Product instance
      */
     public Product setCategory3(String category3) {
         this.category3 = category3;
@@ -249,8 +258,8 @@ public Product setCategory3(String category3) {
     /**
      * Set a new fourth category
      *
-     * @param category4 String
-     * @return Product
+     * @param category4 /
+     * @return Product instance
      */
     public Product setCategory4(String category4) {
         this.category4 = category4;
@@ -260,8 +269,8 @@ public Product setCategory4(String category4) {
     /**
      * Set a new fifth category
      *
-     * @param category5 String
-     * @return Product
+     * @param category5 /
+     * @return Product instance
      */
     public Product setCategory5(String category5) {
         this.category5 = category5;
@@ -271,8 +280,8 @@ public Product setCategory5(String category5) {
     /**
      * Set a new sixth category
      *
-     * @param category6 String
-     * @return Product
+     * @param category6 /
+     * @return Product instance
      */
     public Product setCategory6(String category6) {
         this.category6 = category6;
@@ -282,8 +291,8 @@ public Product setCategory6(String category6) {
     /**
      * Set a new quantity
      *
-     * @param quantity int
-     * @return Product
+     * @param quantity /
+     * @return Product instance
      */
     public Product setQuantity(int quantity) {
         this.quantity = quantity;
@@ -293,8 +302,8 @@ public Product setQuantity(int quantity) {
     /**
      * Set a new unit price tax included value
      *
-     * @param unitPriceTaxIncluded double
-     * @return Product
+     * @param unitPriceTaxIncluded /
+     * @return Product instance
      */
     public Product setUnitPriceTaxIncluded(double unitPriceTaxIncluded) {
         this.unitPriceTaxIncluded = unitPriceTaxIncluded;
@@ -304,8 +313,8 @@ public Product setUnitPriceTaxIncluded(double unitPriceTaxIncluded) {
     /**
      * Set a new unit price tax free
      *
-     * @param unitPriceTaxFree double
-     * @return Product
+     * @param unitPriceTaxFree /
+     * @return Product instance
      */
     public Product setUnitPriceTaxFree(double unitPriceTaxFree) {
         this.unitPriceTaxFree = unitPriceTaxFree;
@@ -315,8 +324,8 @@ public Product setUnitPriceTaxFree(double unitPriceTaxFree) {
     /**
      * Set a new discount tax included value
      *
-     * @param discountTaxIncluded double
-     * @return Product
+     * @param discountTaxIncluded /
+     * @return Product instance
      */
     public Product setDiscountTaxIncluded(double discountTaxIncluded) {
         this.discountTaxIncluded = discountTaxIncluded;
@@ -326,8 +335,8 @@ public Product setDiscountTaxIncluded(double discountTaxIncluded) {
     /**
      * Set a new discount tax free value
      *
-     * @param discountTaxFree double
-     * @return Product
+     * @param discountTaxFree /
+     * @return Product instance
      */
     public Product setDiscountTaxFree(double discountTaxFree) {
         this.discountTaxFree = discountTaxFree;
@@ -337,8 +346,8 @@ public Product setDiscountTaxFree(double discountTaxFree) {
     /**
      * Set a new promotional code
      *
-     * @param promotionalCode String
-     * @return Product
+     * @param promotionalCode /
+     * @return Product instance
      */
     public Product setPromotionalCode(String promotionalCode) {
         this.promotionalCode = promotionalCode;
@@ -348,20 +357,14 @@ public Product setPromotionalCode(String promotionalCode) {
     /**
      * Get CustomObjects
      *
-     * @return CustomObjects
+     * @return CustomObjects instance
      */
     public CustomObjects CustomObjects() {
         return customObjects == null ? (customObjects = new CustomObjects(this)) : customObjects;
     }
 
-    Product(Tracker tracker) {
-        super(tracker);
-        action = Action.View;
-        productId = "";
-    }
-
     /**
-     * Send products view hit
+     * Send viewed product
      */
     public void sendView() {
         action = Action.View;
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Products.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Products.java
index 0ede6b92..55b5480c 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Products.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Products.java
@@ -26,6 +26,9 @@ of this software and associated documentation files (the "Software"), to deal
 import java.util.LinkedHashMap;
 import java.util.Set;
 
+/**
+ * Wrapper class to manage Product instances
+ */
 public class Products extends Helper {
 
     private final Cart cart;
@@ -40,10 +43,10 @@ public class Products extends Helper {
     }
 
     /**
-     * Add a product
+     * Attach the product to tracking
      *
-     * @param product Product
-     * @return Product
+     * @param product Product instance
+     * @return Product instance
      */
     public Product add(Product product) {
         if (cart != null) {
@@ -57,8 +60,8 @@ public Product add(Product product) {
     /**
      * Add a product
      *
-     * @param productId String
-     * @return Product
+     * @param productId product identifier
+     * @return Product instance
      */
     public Product add(String productId) {
         Product product = new Product(cart != null ? cart.getTracker() : tracker).setProductId(productId);
@@ -73,9 +76,9 @@ public Product add(String productId) {
     /**
      * Add a product
      *
-     * @param productId String
-     * @param category1 String
-     * @return Product
+     * @param productId product identifier
+     * @param category1 product first category
+     * @return Product instance
      */
     public Product add(String productId, String category1) {
         return add(productId).setCategory1(category1);
@@ -84,10 +87,10 @@ public Product add(String productId, String category1) {
     /**
      * Add a product
      *
-     * @param productId String
-     * @param category1 String
-     * @param category2 String
-     * @return Product
+     * @param productId product identifier
+     * @param category1 product first category
+     * @param category2 product second category
+     * @return Product instance
      */
     public Product add(String productId, String category1, String category2) {
         return add(productId, category1).setCategory2(category2);
@@ -96,11 +99,11 @@ public Product add(String productId, String category1, String category2) {
     /**
      * Add a product
      *
-     * @param productId String
-     * @param category1 String
-     * @param category2 String
-     * @param category3 String
-     * @return Product
+     * @param productId product identifier
+     * @param category1 product first category
+     * @param category2 product second category
+     * @param category3 product third category
+     * @return Product instance
      */
     public Product add(String productId, String category1, String category2, String category3) {
         return add(productId, category1, category2).setCategory3(category3);
@@ -109,12 +112,12 @@ public Product add(String productId, String category1, String category2, String
     /**
      * Add a product
      *
-     * @param productId String
-     * @param category1 String
-     * @param category2 String
-     * @param category3 String
-     * @param category4 String
-     * @return Product
+     * @param productId product identifier
+     * @param category1 product first category
+     * @param category2 product second category
+     * @param category3 product third category
+     * @param category4 product fourth category
+     * @return Product instance
      */
     public Product add(String productId, String category1, String category2, String category3, String category4) {
         return add(productId, category1, category2, category3).setCategory4(category4);
@@ -123,13 +126,13 @@ public Product add(String productId, String category1, String category2, String
     /**
      * Add a product
      *
-     * @param productId String
-     * @param category1 String
-     * @param category2 String
-     * @param category3 String
-     * @param category4 String
-     * @param category5 String
-     * @return Product
+     * @param productId product identifier
+     * @param category1 product first category
+     * @param category2 product second category
+     * @param category3 product third category
+     * @param category4 product fourth category
+     * @param category5 product fifth category
+     * @return Product instance
      */
     public Product add(String productId, String category1, String category2, String category3, String category4, String category5) {
         return add(productId, category1, category2, category3, category4).setCategory5(category5);
@@ -138,14 +141,14 @@ public Product add(String productId, String category1, String category2, String
     /**
      * Add a product
      *
-     * @param productId String
-     * @param category1 String
-     * @param category2 String
-     * @param category3 String
-     * @param category4 String
-     * @param category5 String
-     * @param category6 String
-     * @return Product
+     * @param productId product identifier
+     * @param category1 product first category
+     * @param category2 product second category
+     * @param category3 product third category
+     * @param category4 product fourth category
+     * @param category5 product fifth category
+     * @param category6 product sixth category
+     * @return Product instance
      */
     public Product add(String productId, String category1, String category2, String category3, String category4, String category5, String category6) {
         return add(productId, category1, category2, category3, category4, category5).setCategory6(category6);
@@ -154,7 +157,7 @@ public Product add(String productId, String category1, String category2, String
     /**
      * Remove a product
      *
-     * @param productId String
+     * @param productId product identifier
      */
     public void remove(String productId) {
         int length;
@@ -206,7 +209,7 @@ public void removeAll() {
     }
 
     /**
-     * Send all products
+     * Send all viewed products
      */
     public void sendViews() {
         ArrayList<BusinessObject> views = new ArrayList<>();
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Publisher.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Publisher.java
index ae14a8d2..12d1ac37 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Publisher.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Publisher.java
@@ -24,9 +24,11 @@ of this software and associated documentation files (the "Software"), to deal
 
 import android.text.TextUtils;
 
-import java.util.ArrayList;
 import java.util.LinkedHashMap;
 
+/**
+ * Wrapper class for advertising publisher tracking
+ */
 public class Publisher extends OnAppAd {
     private static final String PUBLISHER_FORMAT = "PUB-%1$s-%2$s-%3$s-%4$s-%5$s-%6$s-%7$s-%8$s";
     private static final String SCREEN = "screen";
@@ -48,10 +50,15 @@ LinkedHashMap<String, CustomObject> getCustomObjectsMap() {
         return customObjectsMap == null ? (customObjectsMap = new LinkedHashMap<>()) : customObjectsMap;
     }
 
+    Publisher(Tracker tracker) {
+        super(tracker);
+        campaignId = "";
+    }
+
     /**
-     * Get campaign id
+     * Get campaign identifier
      *
-     * @return String
+     * @return the publisher campaign identifier
      */
     public String getCampaignId() {
         return campaignId;
@@ -60,7 +67,7 @@ public String getCampaignId() {
     /**
      * Get creation
      *
-     * @return String
+     * @return the publisher creation
      */
     public String getCreation() {
         return creation;
@@ -69,7 +76,7 @@ public String getCreation() {
     /**
      * Get variant
      *
-     * @return String
+     * @return the publisher variant
      */
     public String getVariant() {
         return variant;
@@ -78,7 +85,7 @@ public String getVariant() {
     /**
      * Get format
      *
-     * @return String
+     * @return the publisher format
      */
     public String getFormat() {
         return format;
@@ -87,7 +94,7 @@ public String getFormat() {
     /**
      * Get general placement
      *
-     * @return String
+     * @return the publisher general placement
      */
     public String getGeneralPlacement() {
         return generalPlacement;
@@ -96,16 +103,16 @@ public String getGeneralPlacement() {
     /**
      * Get detailed placement
      *
-     * @return String
+     * @return the publisher detailed placement
      */
     public String getDetailedPlacement() {
         return detailedPlacement;
     }
 
     /**
-     * Get advertiser id
+     * Get advertiser identifier
      *
-     * @return String
+     * @return the publisher edvertiser identifier
      */
     public String getAdvertiserId() {
         return advertiserId;
@@ -114,7 +121,7 @@ public String getAdvertiserId() {
     /**
      * Get url
      *
-     * @return String
+     * @return the publisher url
      */
     public String getUrl() {
         return url;
@@ -123,8 +130,8 @@ public String getUrl() {
     /**
      * Set a new campaign id
      *
-     * @param campaignId String
-     * @return Publisher
+     * @param campaignId campaign identifier
+     * @return Publisher instance
      */
     public Publisher setCampaignId(String campaignId) {
         this.campaignId = campaignId;
@@ -134,8 +141,8 @@ public Publisher setCampaignId(String campaignId) {
     /**
      * Set a new creation
      *
-     * @param creation String
-     * @return Publisher
+     * @param creation /
+     * @return Publisher instance
      */
     public Publisher setCreation(String creation) {
         this.creation = creation;
@@ -145,8 +152,8 @@ public Publisher setCreation(String creation) {
     /**
      * Set variant
      *
-     * @param variant String
-     * @return Pubisher
+     * @param variant /
+     * @return Publisher instance
      */
     public Publisher setVariant(String variant) {
         this.variant = variant;
@@ -156,8 +163,8 @@ public Publisher setVariant(String variant) {
     /**
      * Set format
      *
-     * @param format String
-     * @return Publisher
+     * @param format /
+     * @return Publisher instance
      */
     public Publisher setFormat(String format) {
         this.format = format;
@@ -167,8 +174,8 @@ public Publisher setFormat(String format) {
     /**
      * Set a new general placement
      *
-     * @param generalPlacement String
-     * @return Publisher
+     * @param generalPlacement /
+     * @return Publisher instance
      */
     public Publisher setGeneralPlacement(String generalPlacement) {
         this.generalPlacement = generalPlacement;
@@ -178,8 +185,8 @@ public Publisher setGeneralPlacement(String generalPlacement) {
     /**
      * Set a new detailed placement
      *
-     * @param detailedPlacement String
-     * @return Publisher
+     * @param detailedPlacement /
+     * @return Publisher instance
      */
     public Publisher setDetailedPlacement(String detailedPlacement) {
         this.detailedPlacement = detailedPlacement;
@@ -189,8 +196,8 @@ public Publisher setDetailedPlacement(String detailedPlacement) {
     /**
      * Set a new advertiser id
      *
-     * @param advertiserId String
-     * @return Publisher
+     * @param advertiserId /
+     * @return Publisher instance
      */
     public Publisher setAdvertiserId(String advertiserId) {
         this.advertiserId = advertiserId;
@@ -200,8 +207,8 @@ public Publisher setAdvertiserId(String advertiserId) {
     /**
      * Set a new url
      *
-     * @param url String
-     * @return Publisher
+     * @param url /
+     * @return Publisher instance
      */
     public Publisher setUrl(String url) {
         this.url = url;
@@ -211,8 +218,8 @@ public Publisher setUrl(String url) {
     /**
      * Set a new action
      *
-     * @param action OnAppAd.Action
-     * @return Publisher
+     * @param action /
+     * @return Publisher instance
      */
     public Publisher setAction(Action action) {
         this.action = action;
@@ -222,17 +229,12 @@ public Publisher setAction(Action action) {
     /**
      * Get CustomObjects
      *
-     * @return CustomObjects
+     * @return CustomObjects instance
      */
     public CustomObjects CustomObjects() {
         return customObjects == null ? (customObjects = new CustomObjects(this)) : customObjects;
     }
 
-    Publisher(Tracker tracker) {
-        super(tracker);
-        campaignId = "";
-    }
-
     @Override
     void setEvent() {
         String publisher = String.format(PUBLISHER_FORMAT,
@@ -246,18 +248,13 @@ void setEvent() {
                 url != null ? url : "");
 
         Buffer buffer = tracker.getBuffer();
-        ArrayList<int[]> indexes = Tool.findParameterPosition(Hit.HitParam.HitType.stringValue(), buffer.getVolatileParams(), buffer.getPersistentParams());
         String currentType = "";
-
-        for (int[] index : indexes) {
-            int arrayID = index[0];
-            int itemPosition = index[1];
-            if (arrayID == 0) {
-                currentType = buffer.getVolatileParams().get(itemPosition).getValue().execute();
-            } else {
-                currentType = buffer.getPersistentParams().get(itemPosition).getValue().execute();
-            }
+        if (buffer.getVolatileParams().containsKey(Hit.HitParam.HitType.stringValue())) {
+            currentType = buffer.getVolatileParams().get(Hit.HitParam.HitType.stringValue()).getValues().get(0).execute();
+        } else if (buffer.getPersistentParams().containsKey(Hit.HitParam.HitType.stringValue())) {
+            currentType = buffer.getPersistentParams().get(Hit.HitParam.HitType.stringValue()).getValues().get(0).execute();
         }
+
         if (!currentType.equals(SCREEN) && !currentType.equals(AD_TRACKING)) {
             tracker.setParam(Hit.HitParam.HitType.stringValue(), AD_TRACKING);
         }
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/PublisherImpression.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/PublisherImpression.java
index 3935d542..8c77e95d 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/PublisherImpression.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/PublisherImpression.java
@@ -22,16 +22,25 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
+/**
+ * Publisher subclass to manage Publisher impression only
+ */
 public class PublisherImpression extends Publisher {
 
+    PublisherImpression(Tracker tracker) {
+        super(tracker);
+        action = Action.View;
+    }
+
     /**
-     * Constructor
+     * Force action to view
      *
-     * @param tracker Tracker
+     * @param action /
+     * @return Publisher instance
      */
-    public PublisherImpression(Tracker tracker) {
-        super(tracker);
-        action = Action.View;
+    @Override
+    public Publisher setAction(Action action) {
+        return super.setAction(Action.View);
     }
 
     @Override
@@ -40,11 +49,6 @@ public void sendImpression() {
         Tool.executeCallback(tracker.getListener(), Tool.CallbackType.warning, "This method is overrided to do nothing");
     }
 
-    @Override
-    public Publisher setAction(Action action) {
-        return super.setAction(Action.View);
-    }
-
     @Override
     public void sendTouch() {
         // Do Nothing
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/PublisherImpressions.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/PublisherImpressions.java
index b9faa4cb..2522e985 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/PublisherImpressions.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/PublisherImpressions.java
@@ -22,6 +22,9 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
+/**
+ * Wrapper class to manage PublisherImpression instances
+ */
 public class PublisherImpressions extends Helper {
 
     private final AbstractScreen screen;
@@ -32,10 +35,10 @@ public class PublisherImpressions extends Helper {
     }
 
     /**
-     * Add a pub
+     * Add a publisher impression advertising
      *
-     * @param campaignId String
-     * @return PublisherImpression
+     * @param campaignId campaign identifier
+     * @return the PublisherImpression instance
      */
     public PublisherImpression add(String campaignId) {
         PublisherImpression pub = new PublisherImpression(tracker);
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Publishers.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Publishers.java
index 1949a181..18423c6f 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Publishers.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Publishers.java
@@ -26,6 +26,9 @@ of this software and associated documentation files (the "Software"), to deal
 import java.util.LinkedHashMap;
 import java.util.Set;
 
+/**
+ * Wrapper class to manage Publisher instances
+ */
 public class Publishers extends Helper {
 
     Publishers(Tracker tracker) {
@@ -33,10 +36,10 @@ public class Publishers extends Helper {
     }
 
     /**
-     * Add a pub
+     * Add a publisher advertising
      *
-     * @param campaignId String
-     * @return Publisher
+     * @param campaignId campaign identifier
+     * @return the Publisher instance
      */
     public Publisher add(String campaignId) {
         Publisher pub = new Publisher(tracker).setCampaignId(campaignId);
@@ -46,7 +49,7 @@ public Publisher add(String campaignId) {
     }
 
     /**
-     * Send all impressions
+     * Send all publisher impressions
      */
     public void sendImpressions() {
         ArrayList<BusinessObject> impressions = new ArrayList<>();
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/ReferrerReceiver.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/ReferrerReceiver.java
index c7597bd6..340f1e13 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/ReferrerReceiver.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/ReferrerReceiver.java
@@ -24,16 +24,19 @@ of this software and associated documentation files (the "Software"), to deal
 
 import android.content.*;
 
+/**
+ * Broadcast Receiver to catch store referrer
+ */
 public class ReferrerReceiver extends BroadcastReceiver {
 
     private static final String REFERRER_INTENT_ACTION = "com.android.vending.INSTALL_REFERRER";
     private static final String REFERRER = "referrer";
 
     /**
-     * Overriding onReceive
+     * Called by Android
      *
-     * @param context android.content.Context
-     * @param intent  Intent
+     * @param context current context
+     * @param intent  calling intent
      */
     @Override
     public void onReceive(android.content.Context context, Intent intent) {
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/RichMedia.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/RichMedia.java
index 09651328..17dd9d40 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/RichMedia.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/RichMedia.java
@@ -27,6 +27,9 @@ of this software and associated documentation files (the "Software"), to deal
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
+/**
+ * Abstract class to manage rich media tracking
+ */
 public abstract class RichMedia extends BusinessObject {
 
     static final int MAX_DURATION = 86400;
@@ -50,7 +53,7 @@ public String stringValue() {
     }
 
     /**
-     * Enum with different action type
+     * Enum with different action types
      */
     public enum Action {
         Play("play"),
@@ -106,37 +109,48 @@ String getType() {
         return type;
     }
 
+    RichMedia(MediaPlayer player) {
+        super(player.getTracker());
+        mediaPlayer = player;
+        name = "";
+        level2 = -1;
+        refreshDuration = -1;
+        isEmbedded = false;
+        isBuffering = false;
+        webDomain = null;
+    }
+
     /**
      * Get level 2
      *
-     * @return int
+     * @return the level 2
      */
     public int getLevel2() {
         return level2;
     }
 
     /**
-     * Get boolean isBuffering value
+     * Get boolean "isBuffering" value
      *
-     * @return boolean
+     * @return true if the media is buffering
      */
     public boolean isBuffering() {
         return isBuffering;
     }
 
     /**
-     * Get boolean isEmbedded value
+     * Get boolean "isEmbedded" value
      *
-     * @return boolean
+     * @return true if the media is embedded in app
      */
     public boolean isEmbedded() {
         return isEmbedded;
     }
 
     /**
-     * Get name
+     * Get media name
      *
-     * @return String
+     * @return the media name
      */
     public String getName() {
         return name;
@@ -145,7 +159,7 @@ public String getName() {
     /**
      * Get first chapter
      *
-     * @return String
+     * @return the first chapter
      */
     public String getChapter1() {
         return chapter1;
@@ -154,7 +168,7 @@ public String getChapter1() {
     /**
      * Get second chapter
      *
-     * @return String
+     * @return the second chapter
      */
     public String getChapter2() {
         return chapter2;
@@ -163,7 +177,7 @@ public String getChapter2() {
     /**
      * Get third chapter
      *
-     * @return String
+     * @return the third chapter
      */
     public String getChapter3() {
         return chapter3;
@@ -172,23 +186,12 @@ public String getChapter3() {
     /**
      * Get web domain
      *
-     * @return String
+     * @return the web domain
      */
     public String getWebDomain() {
         return webDomain;
     }
 
-    RichMedia(MediaPlayer player) {
-        super(player.getTracker());
-        mediaPlayer = player;
-        name = "";
-        level2 = -1;
-        refreshDuration = -1;
-        isEmbedded = false;
-        isBuffering = false;
-        webDomain = null;
-    }
-
     @Override
     void setEvent() {
         ParamOption encode = new ParamOption().setEncode(true);
@@ -227,18 +230,19 @@ void setEvent() {
     }
 
     /**
-     * Send play
+     * Send a play action tracking. Refresh is enabled with default duration
      */
     public void sendPlay() {
         sendPlay(5);
     }
 
     /**
-     * Send play with a refresh duration
+     * Send play with a custom refresh duration
      *
-     * @param refreshDuration int
+     * @param refreshDuration refresh duration in second, must be higher than 5
      */
     public void sendPlay(int refreshDuration) {
+        final RichMedia self = this;
         if (refreshDuration != 0) {
             if (refreshDuration < 5) {
                 refreshDuration = 5;
@@ -249,7 +253,7 @@ public void sendPlay(int refreshDuration) {
                     @Override
                     public void run() {
                         action = RichMedia.Action.Refresh;
-                        tracker.getDispatcher().dispatch(RichMedia.this);
+                        tracker.getDispatcher().dispatch(self);
                     }
                 }, refreshDuration, refreshDuration, TimeUnit.SECONDS);
             }
@@ -259,7 +263,7 @@ public void run() {
     }
 
     /**
-     * Send pause
+     * Send a pause action tracking
      */
     public void sendPause() {
         action = RichMedia.Action.Pause;
@@ -270,7 +274,7 @@ public void sendPause() {
     }
 
     /**
-     * Send stop
+     * Send a stop action tracking
      */
     public void sendStop() {
         action = RichMedia.Action.Stop;
@@ -281,7 +285,7 @@ public void sendStop() {
     }
 
     /**
-     * Send move
+     * Send a move action tracking
      */
     public void sendMove() {
         action = RichMedia.Action.Move;
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Screen.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Screen.java
index fdd817ef..80fd344b 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Screen.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Screen.java
@@ -1,17 +1,14 @@
 /*
 This SDK is licensed under the MIT license (MIT)
 Copyright (c) 2015- Applied Technologies Internet SAS (registration number B 403 261 258 - Trade and Companies Register of Bordeaux – France)
-
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
-
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
-
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -22,37 +19,42 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
+/**
+ * Wrapper class for screen tracking
+ */
 public class Screen extends AbstractScreen {
 
+    Screen(Tracker tracker) {
+        super(tracker);
+    }
+
     /**
      * Set a new name
      *
-     * @param name String
-     * @return Screen
+     * @param name /
+     * @return the Screen instance
      */
     public Screen setName(String name) {
         this.name = name;
-
         return this;
     }
 
     /**
      * Set a new action
      *
-     * @param action AbstractScreen.Action
-     * @return Screen
+     * @param action /
+     * @return the Screen instance
      */
     public Screen setAction(Action action) {
         this.action = action;
-
         return this;
     }
 
     /**
      * Set a new first chapter
      *
-     * @param chapter1 String
-     * @return Screen
+     * @param chapter1 /
+     * @return the Screen instance
      */
     public Screen setChapter1(String chapter1) {
         this.chapter1 = chapter1;
@@ -62,8 +64,8 @@ public Screen setChapter1(String chapter1) {
     /**
      * Set a new second chapter
      *
-     * @param chapter2 String
-     * @return Screen
+     * @param chapter2 /
+     * @return the Screen instance
      */
     public Screen setChapter2(String chapter2) {
         this.chapter2 = chapter2;
@@ -73,8 +75,8 @@ public Screen setChapter2(String chapter2) {
     /**
      * Set a new third chapter
      *
-     * @param chapter3 String
-     * @return Screen
+     * @param chapter3 /
+     * @return the Screen instance
      */
     public Screen setChapter3(String chapter3) {
         this.chapter3 = chapter3;
@@ -84,34 +86,28 @@ public Screen setChapter3(String chapter3) {
     /**
      * Set a new level 2
      *
-     * @param level2 int
-     * @return Screen
+     * @param level2 /
+     * @return the Screen instance
      */
     public Screen setLevel2(int level2) {
         this.level2 = level2;
-
         return this;
     }
 
     /**
-     * Change boolean isBasketScreen value
+     * Change boolean "isBasketScreen" value
      *
-     * @param isBasketScreen boolean
-     * @return Screen
+     * @param isBasketScreen /
+     * @return the Screen instance
      */
     public Screen setIsBasketScreen(boolean isBasketScreen) {
         this.isBasketScreen = isBasketScreen;
         return this;
     }
 
-    Screen(Tracker tracker) {
-        super(tracker);
-    }
-
     @Override
     void setEvent() {
         super.setEvent();
-
         String value = chapter1;
         if (value == null) {
             value = chapter2;
@@ -123,13 +119,11 @@ void setEvent() {
         } else {
             value += chapter3 == null ? "" : "::" + chapter3;
         }
-
         if (value == null) {
             value = name;
         } else {
             value += name == null ? "" : "::" + name;
         }
-
         tracker.Event().set("screen", action.stringValue(), value);
     }
-}
+}
\ No newline at end of file
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Screens.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Screens.java
index 1c2b0e21..6bee3733 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Screens.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Screens.java
@@ -22,6 +22,9 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
+/**
+ * Wrapper class to manage Screen instances
+ */
 public class Screens extends Helper {
 
     Screens(Tracker tracker) {
@@ -29,9 +32,9 @@ public class Screens extends Helper {
     }
 
     /**
-     * Add a screen
+     * Add a new screen
      *
-     * @return Screen
+     * @return the Screen instance
      */
     public Screen add() {
         Screen screen = new Screen(tracker);
@@ -41,10 +44,10 @@ public Screen add() {
     }
 
     /**
-     * Add a screen
+     * Add a new screen
      *
-     * @param context android.content.Context
-     * @return Screen
+     * @param context current Activity context
+     * @return the Screen instance
      */
     public Screen add(android.content.Context context) {
         Screen screen = new Screen(tracker)
@@ -55,10 +58,10 @@ public Screen add(android.content.Context context) {
     }
 
     /**
-     * Add a screen
+     * Add a new screen
      *
-     * @param name String
-     * @return Screen
+     * @param name screen name
+     * @return the Screen instance
      */
     public Screen add(String name) {
         Screen screen = new Screen(tracker)
@@ -69,36 +72,36 @@ public Screen add(String name) {
     }
 
     /**
-     * Add a screen
+     * Add a new screen
      *
-     * @param name     Strin
-     * @param chapter1 String
-     * @return Screen
+     * @param name     screen name
+     * @param chapter1 screen first chapter
+     * @return the Screen instance
      */
     public Screen add(String name, String chapter1) {
         return add(name).setChapter1(chapter1);
     }
 
     /**
-     * Add a screen
+     * Add a new screen
      *
-     * @param name     String
-     * @param chapter1 String
-     * @param chapter2 String
-     * @return Screen
+     * @param name     screen name
+     * @param chapter1 screen first chapter
+     * @param chapter2 screen second chapter
+     * @return the Screen instance
      */
     public Screen add(String name, String chapter1, String chapter2) {
         return add(name, chapter1).setChapter2(chapter2);
     }
 
     /**
-     * Add a screen
+     * Add a new screen
      *
-     * @param name     String
-     * @param chapter1 String
-     * @param chapter2 String
-     * @param chapter3 String
-     * @return Screen
+     * @param name     screen name
+     * @param chapter1 screen first chapter
+     * @param chapter2 screen second chapter
+     * @param chapter3 screen third chapter
+     * @return the Screen instance
      */
     public Screen add(String name, String chapter1, String chapter2, String chapter3) {
         return add(name, chapter1, chapter2).setChapter3(chapter3);
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/SelfPromotion.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/SelfPromotion.java
index 9c298e9d..4e38f4d8 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/SelfPromotion.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/SelfPromotion.java
@@ -24,9 +24,11 @@ of this software and associated documentation files (the "Software"), to deal
 
 import android.text.TextUtils;
 
-import java.util.ArrayList;
 import java.util.LinkedHashMap;
 
+/**
+ * Wrapper class for advertising self promotion tracking
+ */
 public class SelfPromotion extends OnAppAd {
     private static final String SELF_PROMOTION_FORMAT = "INT-%1$s-%2$s||%3$s";
     private static final String SCREEN = "screen";
@@ -43,38 +45,43 @@ LinkedHashMap<String, CustomObject> getCustomObjectsMap() {
         return customObjectsMap == null ? (customObjectsMap = new LinkedHashMap<>()) : customObjectsMap;
     }
 
+    SelfPromotion(Tracker tracker) {
+        super(tracker);
+        adId = -1;
+    }
+
     /**
-     * Get ad id
+     * Get advertising identifier
      *
-     * @return int
+     * @return the advertising identifier
      */
     public int getAdId() {
         return adId;
     }
 
     /**
-     * Get format
+     * Get advertising format
      *
-     * @return String
+     * @return the advertising format
      */
     public String getFormat() {
         return format;
     }
 
     /**
-     * Get product id
+     * Get advertising product identifier
      *
-     * @return String
+     * @return the advertising product identifier
      */
     public String getProductId() {
         return productId;
     }
 
     /**
-     * Set a new ad id
+     * Set a new advertising identifier
      *
-     * @param adId int
-     * @return SelfPromotion
+     * @param adId advertising identifier
+     * @return the SelfPromotion instance
      */
     public SelfPromotion setAdId(int adId) {
         this.adId = adId;
@@ -82,10 +89,10 @@ public SelfPromotion setAdId(int adId) {
     }
 
     /**
-     * Set a new format
+     * Set a new advertising format
      *
-     * @param format String
-     * @return SelfPromotion
+     * @param format advertising format
+     * @return the SelfPromotion instance
      */
     public SelfPromotion setFormat(String format) {
         this.format = format;
@@ -93,10 +100,10 @@ public SelfPromotion setFormat(String format) {
     }
 
     /**
-     * Set a new product id
+     * Set a new advertising product identifier
      *
-     * @param productId String
-     * @return SelfPromotion
+     * @param productId advertising product identifier
+     * @return the SelfPromotion instance
      */
     public SelfPromotion setProductId(String productId) {
         this.productId = productId;
@@ -106,8 +113,8 @@ public SelfPromotion setProductId(String productId) {
     /**
      * Set a new action
      *
-     * @param action OnAppAd.Action
-     * @return SelfPromotion
+     * @param action /
+     * @return the SelfPromotion instance
      */
     public SelfPromotion setAction(Action action) {
         this.action = action;
@@ -115,19 +122,14 @@ public SelfPromotion setAction(Action action) {
     }
 
     /**
-     * Get CustomObjects
+     * Get a wrapper for CustomObject management
      *
-     * @return CustomObjects
+     * @return the CustomObjects instance
      */
     public CustomObjects CustomObjects() {
         return customObjects == null ? (customObjects = new CustomObjects(this)) : customObjects;
     }
 
-    SelfPromotion(Tracker tracker) {
-        super(tracker);
-        adId = -1;
-    }
-
     @Override
     void setEvent() {
         String selfPromotion = String.format(SELF_PROMOTION_FORMAT,
@@ -136,18 +138,14 @@ void setEvent() {
                 productId != null ? productId : "");
 
         Buffer buffer = tracker.getBuffer();
-        ArrayList<int[]> indexes = Tool.findParameterPosition(Hit.HitParam.HitType.stringValue(), buffer.getVolatileParams(), buffer.getPersistentParams());
-        String currentType = "";
 
-        for (int[] index : indexes) {
-            int arrayID = index[0];
-            int itemPosition = index[1];
-            if (arrayID == 0) {
-                currentType = buffer.getVolatileParams().get(itemPosition).getValue().execute();
-            } else {
-                currentType = buffer.getPersistentParams().get(itemPosition).getValue().execute();
-            }
+        String currentType = "";
+        if (buffer.getVolatileParams().containsKey(Hit.HitParam.HitType.stringValue())) {
+            currentType = buffer.getVolatileParams().get(Hit.HitParam.HitType.stringValue()).getValues().get(0).execute();
+        } else if (buffer.getPersistentParams().containsKey(Hit.HitParam.HitType.stringValue())) {
+            currentType = buffer.getPersistentParams().get(Hit.HitParam.HitType.stringValue()).getValues().get(0).execute();
         }
+
         if (!currentType.equals(SCREEN) && !currentType.equals(AD_TRACKING)) {
             tracker.setParam(Hit.HitParam.HitType.stringValue(), AD_TRACKING);
         }
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/SelfPromotionImpression.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/SelfPromotionImpression.java
index 1c32cee7..6b05afc1 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/SelfPromotionImpression.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/SelfPromotionImpression.java
@@ -22,29 +22,34 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
+/**
+ * SelfPromotion subclass to manage self promotion impression only
+ */
 public class SelfPromotionImpression extends SelfPromotion {
 
+    SelfPromotionImpression(Tracker tracker) {
+        super(tracker);
+        action = Action.View;
+    }
+
     /**
-     * Constructor
+     * Force action to view
      *
-     * @param tracker Tracker
+     * @param action /
+     * @return SelfPromotion instance
      */
-    public SelfPromotionImpression(Tracker tracker) {
-        super(tracker);
-        action = Action.View;
+    @Override
+    public SelfPromotion setAction(Action action) {
+        return super.setAction(Action.View);
     }
 
+
     @Override
     public void sendImpression() {
         // Do Nothing
         Tool.executeCallback(tracker.getListener(), Tool.CallbackType.warning, "This method is overrided to do nothing");
     }
 
-    @Override
-    public SelfPromotion setAction(Action action) {
-        return super.setAction(Action.View);
-    }
-
     @Override
     public void sendTouch() {
         // Do Nothing
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/SelfPromotionImpressions.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/SelfPromotionImpressions.java
index 10e8b685..a67ca5f1 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/SelfPromotionImpressions.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/SelfPromotionImpressions.java
@@ -22,6 +22,9 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
+/**
+ * Wrapper class to manage SelfPromotionImpression instances
+ */
 public class SelfPromotionImpressions extends Helper {
 
     private final AbstractScreen screen;
@@ -32,10 +35,10 @@ public class SelfPromotionImpressions extends Helper {
     }
 
     /**
-     * Add a pub
+     * Add a self promotion impression advertising
      *
-     * @param adId int
-     * @return SelfPromotionImpression
+     * @param adId advertising identifier
+     * @return the SelfPromotionImpression instance
      */
     public SelfPromotionImpression add(int adId) {
         SelfPromotionImpression self = new SelfPromotionImpression(tracker);
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/SelfPromotions.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/SelfPromotions.java
index 1fa5a884..76290463 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/SelfPromotions.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/SelfPromotions.java
@@ -26,6 +26,9 @@ of this software and associated documentation files (the "Software"), to deal
 import java.util.LinkedHashMap;
 import java.util.Set;
 
+/**
+ * Wrapper class to manage SelfPromotion instances
+ */
 public class SelfPromotions extends Helper {
 
     SelfPromotions(Tracker tracker) {
@@ -33,10 +36,10 @@ public class SelfPromotions extends Helper {
     }
 
     /**
-     * Add a pub
+     * Add a self promotion advertising
      *
-     * @param adId int
-     * @return SelfPromotion
+     * @param adId advertising identifier
+     * @return the SelfPromotion instance
      */
     public SelfPromotion add(int adId) {
         SelfPromotion self = new SelfPromotion(tracker).setAdId(adId);
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Sender.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Sender.java
deleted file mode 100644
index 98c23e02..00000000
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Sender.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
-This SDK is licensed under the MIT license (MIT)
-Copyright (c) 2015- Applied Technologies Internet SAS (registration number B 403 261 258 - Trade and Companies Register of Bordeaux – France)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
- */
-package com.atinternet.tracker;
-
-import android.app.Activity;
-import android.text.TextUtils;
-
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.ArrayList;
-
-import static com.atinternet.tracker.TechnicalContext.ConnectionType;
-import static com.atinternet.tracker.TechnicalContext.getConnection;
-import static com.atinternet.tracker.Tool.CallbackType;
-import static com.atinternet.tracker.Tracker.*;
-
-class Sender implements Runnable {
-
-    /**
-     * Constant number of retry
-     */
-    private static final int RETRY_COUNT = 3;
-
-    /**
-     * Constant Timeout
-     */
-    private static final int TIMEOUT = 15000;
-
-    /**
-     * Constant name error
-     */
-    private static final String RECEIVE_FROM_SERVER_ERROR = "recvfrom";
-
-    /**
-     * Instance Tracker Listener for callbacks
-     */
-    private final TrackerListener trackerListener;
-
-    /**
-     * Instance Storage
-     */
-    private final Storage storage;
-
-    /**
-     * Hit
-     */
-    private final Hit hit;
-
-    /**
-     * Olt Param built by the builder
-     */
-    private final String oltParameter;
-
-    /**
-     * Offline hit processing boolean
-     */
-    private static boolean OfflineHitProcessing = false;
-
-    /**
-     * Boolean to know if this was created from tracker
-     */
-    private final boolean forceSendOfflineHits;
-
-    /**
-     * Init a sender
-     *
-     * @param trackerListener      TrackerListener
-     * @param forceSendOfflineHits boolean
-     * @param hit                  Hit
-     */
-    Sender(TrackerListener trackerListener, Hit hit, boolean forceSendOfflineHits, String... oltParameter) {
-        this.trackerListener = trackerListener;
-        this.storage = getStorage();
-        this.hit = hit;
-        this.forceSendOfflineHits = forceSendOfflineHits;
-        this.oltParameter = oltParameter.length > 0 ? oltParameter[0] : "";
-    }
-
-    /**
-     * Send the hit
-     */
-    private void send(final Hit hit) {
-
-        if (storage.getOfflineMode() == OfflineMode.always && !forceSendOfflineHits) {
-            saveHitDatabase(hit);
-        }
-        // Si pas de connexion
-        else if (getConnection() == ConnectionType.offline || (!hit.isOffline() && storage.getCountOfflineHits() > 0)) {
-            // Si le hit ne provient pas du offline
-            if (storage.getOfflineMode() != OfflineMode.never && !hit.isOffline()) {
-                saveHitDatabase(hit);
-            }
-        } else {
-            HttpURLConnection connection = null;
-            try {
-                // Execution de la requête
-                URL url = new URL(hit.getUrl());
-                connection = (HttpURLConnection) url.openConnection();
-                connection.setReadTimeout(TIMEOUT);
-                connection.setConnectTimeout(TIMEOUT);
-                connection.connect();
-
-                int statusCode = connection.getResponseCode();
-                final String message = connection.getResponseMessage();
-
-                // Le hit n'a pas pu être envoyé
-                if (statusCode != 200) {
-                    if (storage.getOfflineMode() != OfflineMode.never) {
-                        if (!hit.isOffline()) {
-                            saveHitDatabase(hit);
-                        } else {
-                            updateRetryCount(hit);
-                        }
-                    }
-                    Tool.executeCallback(trackerListener, CallbackType.send, message, TrackerListener.HitStatus.Failed);
-                    updateDebugger(message, "error48", false);
-                }
-                // Le hit a été envoyé
-                else {
-                    // Si le hit provient du stockage, on le supprime de la base
-                    if (hit.isOffline()) {
-                        storage.deleteHit(hit.getUrl());
-                    }
-                    Tool.executeCallback(trackerListener, CallbackType.send, hit.getUrl(), TrackerListener.HitStatus.Success);
-                    updateDebugger(hit.getUrl(), "sent48", true);
-                }
-            } catch (final Exception e) {
-                updateDebugger(e.getMessage(), "error48", false);
-                // Si une erreur est survenue au moment de la récupération du pixel de marquage mais que le hit est bien envoyé
-                if (checkExceptionServerReceiveData(e)) {
-                    // Si il s'agissait d'un hit offline, on le supprime
-                    if (hit.isOffline()) {
-                        storage.deleteHit(hit.getUrl());
-                    }
-                } else {
-                    if (storage.getOfflineMode() != OfflineMode.never) {
-                        if (!hit.isOffline()) {
-                            saveHitDatabase(hit);
-                        } else {
-                            updateRetryCount(hit);
-                        }
-                    }
-                }
-            } finally {
-                if (connection != null) {
-                    connection.disconnect();
-                }
-            }
-        }
-    }
-
-    @Override
-    public void run() {
-        send(false);
-    }
-
-    /**
-     * Send hit
-     *
-     * @param includeOfflineHits boolean
-     */
-    void send(boolean includeOfflineHits) {
-        if (includeOfflineHits) {
-            Sender.sendOfflineHits(trackerListener, storage, false, forceSendOfflineHits);
-        }
-        send(hit);
-    }
-
-    /**
-     * Send offline hits
-     *
-     * @param listener             TrackerListener
-     * @param storage              Storage
-     * @param async                boolean
-     * @param forceSendOfflineHits boolean
-     */
-    public static void sendOfflineHits(TrackerListener listener, Storage storage, boolean forceSendOfflineHits, boolean async) {
-        if ((storage.getOfflineMode() != OfflineMode.always || forceSendOfflineHits) && TechnicalContext.getConnection() != ConnectionType.offline && !OfflineHitProcessing) {
-
-            if (TrackerQueue.getEnabledFillQueueFromDatabase() && storage.getCountOfflineHits() > 0) {
-                ArrayList<Hit> offlineHits = storage.getOfflineHits();
-                if (async) {
-                    TrackerQueue.setEnabledFillQueueFromDatabase(false);
-                    for (Hit hit : offlineHits) {
-                        Sender sender = new Sender(listener, hit, forceSendOfflineHits);
-                        TrackerQueue.getInstance().put(sender);
-                    }
-                    TrackerQueue.getInstance().put(new Runnable() {
-                        @Override
-                        public void run() {
-                            TrackerQueue.setEnabledFillQueueFromDatabase(true);
-                        }
-                    });
-                } else {
-                    OfflineHitProcessing = true;
-                    for (Hit hit : offlineHits) {
-                        Sender sender = new Sender(listener, hit, forceSendOfflineHits);
-                        sender.send(false);
-                    }
-                    OfflineHitProcessing = false;
-                }
-            }
-        }
-    }
-
-    /**
-     * Update retry
-     */
-    private void updateRetryCount(Hit hit) {
-        int retryCount = hit.getRetry();
-        if (retryCount < RETRY_COUNT) {
-            storage.updateRetry(hit.getUrl(), retryCount + 1);
-        } else {
-            storage.deleteHit(hit.getUrl());
-        }
-    }
-
-    /**
-     * Store the hit into Database
-     */
-    void saveHitDatabase(final Hit hit) {
-        final String url = storage.saveHit(hit.getUrl(), System.currentTimeMillis(), oltParameter);
-        if (!TextUtils.isEmpty(url)) {
-            Tool.executeCallback(trackerListener, CallbackType.save, hit.getUrl());
-            updateDebugger(url, "save48", true);
-        } else {
-            Tool.executeCallback(trackerListener, CallbackType.warning, "Hit could not be saved : " + hit.getUrl());
-            updateDebugger("Hit could not be saved : " + hit.getUrl(), "warning48", false);
-        }
-    }
-
-    /**
-     * Check if request sent but the device not receive pixel data
-     *
-     * @param e Exception
-     * @return boolean
-     */
-    private boolean checkExceptionServerReceiveData(Exception e) {
-        int index = 0;
-        do {
-            if (e.getStackTrace()[index].getMethodName().equals(RECEIVE_FROM_SERVER_ERROR)) {
-                return true;
-            }
-            index++;
-        }
-        while (index < e.getStackTrace().length);
-        return false;
-    }
-
-    /**
-     * Update Debugger from a new event
-     *
-     * @param message String
-     * @param type    String
-     * @param isHit   boolean
-     */
-    private void updateDebugger(final String message, final String type, final boolean isHit) {
-        if (Debugger.getContext() != null) {
-            ((Activity) Debugger.getContext()).runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    Debugger.getDebuggerEvents().add(0, new Debugger.DebuggerEvent(message, type, isHit));
-                    if (Debugger.currentViewVisibleId == R.id.eventViewer) {
-                        Debugger.getDebuggerEventListAdapter().notifyDataSetChanged();
-                    }
-                }
-            });
-        }
-    }
-}
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/SetConfigCallback.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/SetConfigCallback.java
index 4b8e699a..26b1cec9 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/SetConfigCallback.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/SetConfigCallback.java
@@ -22,9 +22,12 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
+/**
+ * SetConfigCallback should be implemented when setConfig method in async mode called
+ */
 public interface SetConfigCallback {
     /**
-     * Callback called when set config is finished
+     * Called when config has been set
      */
     void setConfigEnd();
 }
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Storage.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Storage.java
deleted file mode 100644
index d680adb4..00000000
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Storage.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
-This SDK is licensed under the MIT license (MIT)
-Copyright (c) 2015- Applied Technologies Internet SAS (registration number B 403 261 258 - Trade and Companies Register of Bordeaux – France)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
- */
-package com.atinternet.tracker;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-
-import static com.atinternet.tracker.Tracker.*;
-
-class Storage extends SQLiteOpenHelper {
-
-    /**
-     * Offline mode
-     */
-    private OfflineMode offlineMode;
-
-    /**
-     * SQLITEDatabase requirements
-     */
-    private static final int DATABASE_VERSION = 1;
-    private static final String DATABASE_NAME = "TrackerDatabase";
-    private static final String HITS_STORAGE_TABLE = "StoredOfflineHit";
-    private static final String ID = "id";
-    private static final String HIT = "hit";
-    private static final String RETRY = "retry";
-    private static final String DATE = "date";
-
-    private static final String CREATE_TABLE_QUERY =
-            "CREATE TABLE IF NOT EXISTS " + HITS_STORAGE_TABLE + " (" +
-                    ID + " INTEGER PRIMARY KEY AUTOINCREMENT , " +
-                    HIT + " TEXT NOT NULL , " +
-                    DATE + " INTEGER NOT NULL , " +
-                    RETRY + " INTEGER NOT NULL);";
-
-    /**
-     * Get offline mode
-     *
-     * @return OfflineMode
-     */
-    public OfflineMode getOfflineMode() {
-        return offlineMode;
-    }
-
-    /**
-     * Set offline mode
-     *
-     * @param offlineMode OfflineMode
-     */
-    public void setOfflineMode(OfflineMode offlineMode) {
-        this.offlineMode = offlineMode;
-    }
-
-    /**
-     * Init a Storage
-     *
-     * @param context Context
-     */
-    public Storage(Context context) {
-        super(context, DATABASE_NAME, null, DATABASE_VERSION);
-        this.offlineMode = OfflineMode.required;
-    }
-
-    @Override
-    public void onCreate(SQLiteDatabase db) {
-        db.execSQL(CREATE_TABLE_QUERY);
-    }
-
-    @Override
-    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        db.execSQL("DROP TABLE IF EXISTS " + HITS_STORAGE_TABLE);
-        onCreate(db);
-    }
-
-    /**
-     * Save hit
-     *
-     * @param hit String
-     * @return String
-     */
-    public String saveHit(String hit, long time, String oltParameter) {
-        hit = buildHitToStore(hit, oltParameter);
-        ContentValues values = new ContentValues();
-        values.put(HIT, hit);
-        values.put(RETRY, 0);
-        values.put(DATE, time);
-        SQLiteDatabase db = getWritableDatabase();
-        db.insert(HITS_STORAGE_TABLE, null, values);
-        db.close();
-        return hit;
-    }
-
-    /**
-     * Delete one hit from database
-     *
-     * @param hit String
-     */
-    public void deleteHit(String hit) {
-        SQLiteDatabase db = getWritableDatabase();
-        db.delete(HITS_STORAGE_TABLE, HIT + "='" + hit + "'", null);
-        db.close();
-    }
-
-    /**
-     * Add olt and change cn into the hit
-     *
-     * @param hit String
-     * @param olt String
-     * @return String
-     */
-    String buildHitToStore(String hit, String olt) {
-        String[] hitComponents = hit.split("&");
-        String newHit = hitComponents[0];
-
-        for (int i = 1; i < hitComponents.length; i++) {
-            String[] parameterComponents = hitComponents[i].split("=");
-
-            if (parameterComponents[0].equals("cn")) {
-                newHit += "&cn=offline";
-            } else {
-                newHit += "&" + hitComponents[i];
-            }
-
-            if (parameterComponents[0].equals("ts") || parameterComponents[0].equals("mh")) {
-                newHit += "&olt=" + olt;
-            }
-        }
-        return newHit;
-    }
-
-    /**
-     * Update retry for one record from database
-     *
-     * @param hit   String
-     * @param retry int
-     */
-    public void updateRetry(String hit, int retry) {
-        ContentValues values = new ContentValues();
-        values.put(RETRY, retry);
-        SQLiteDatabase db = getWritableDatabase();
-        db.update(HITS_STORAGE_TABLE, values, HIT + "='" + hit + "'", null);
-        db.close();
-    }
-
-    /**
-     * Get count of hits offline
-     *
-     * @return int
-     */
-    public int getCountOfflineHits() {
-        int result = -1;
-        SQLiteDatabase db = getReadableDatabase();
-        Cursor c = db.rawQuery("SELECT * FROM " + HITS_STORAGE_TABLE, null);
-        if (c != null) {
-            result = c.getCount();
-            c.close();
-        }
-        db.close();
-        return result;
-    }
-
-    /**
-     * Remove all offline hits
-     */
-    public void removeAllOfflineHits() {
-        SQLiteDatabase db = getWritableDatabase();
-        db.delete(HITS_STORAGE_TABLE, null, null);
-        db.close();
-    }
-
-    /**
-     * Remove offline hit older than storage duration
-     */
-    public void removeOldOfflineHits(int storageDuration) {
-        Calendar cal = Calendar.getInstance();
-        cal.setTime(new Date());
-        cal.add(Calendar.DATE, -storageDuration);
-        long maxOldDate = cal.getTime().getTime();
-        SQLiteDatabase db = getWritableDatabase();
-        db.delete(HITS_STORAGE_TABLE, DATE + " < " + maxOldDate, null);
-        db.close();
-    }
-
-    /**
-     * Get offline hits
-     *
-     * @return ArrayList<OfflineHit>
-     */
-    public ArrayList<Hit> getOfflineHits() {
-        ArrayList<Hit> hits = new ArrayList<>();
-        SQLiteDatabase db = getReadableDatabase();
-        Cursor c = db.rawQuery("SELECT * FROM " + HITS_STORAGE_TABLE + " ORDER BY " + ID + " ASC", null);
-        if (c != null && c.getCount() > 0) {
-            c.moveToFirst();
-            do {
-                String hit = c.getString(c.getColumnIndex(HIT));
-                String time = c.getString(c.getColumnIndex(DATE));
-                int retry = c.getInt(c.getColumnIndex(RETRY));
-                hits.add(new Hit(hit, new Date(Long.parseLong(time)), retry, true));
-            }
-            while (c.moveToNext());
-            c.close();
-        }
-        db.close();
-        return hits;
-    }
-
-    /**
-     * Get the oldest saved hit
-     *
-     * @return OfflineHit
-     */
-    public Hit getOldestOfflineHit() {
-        SQLiteDatabase db = getReadableDatabase();
-        Cursor c = db.rawQuery("SELECT * FROM " + HITS_STORAGE_TABLE + " WHERE " + DATE + " = (SELECT MIN(" + DATE + ") FROM " + HITS_STORAGE_TABLE + " )", null);
-        if (c != null && c.moveToFirst()) {
-            String hit = c.getString(c.getColumnIndex(HIT));
-            String time = c.getString(c.getColumnIndex(DATE));
-            int retry = c.getInt(c.getColumnIndex(RETRY));
-            if (hit != null && time != null) {
-                c.close();
-                db.close();
-                return new Hit(hit, new Date(Long.parseLong(time)), retry, true);
-            }
-            c.close();
-        }
-        db.close();
-        return null;
-    }
-
-    /**
-     * Get the latest saved hit
-     *
-     * @return OfflineHit
-     */
-    public Hit getLatestOfflineHit() {
-        SQLiteDatabase db = getReadableDatabase();
-        Cursor c = db.rawQuery("SELECT * FROM " + HITS_STORAGE_TABLE + " WHERE " + DATE + " = (SELECT MAX(" + DATE + ") FROM " + HITS_STORAGE_TABLE + " )", null);
-        if (c != null && c.moveToFirst()) {
-            String hit = c.getString(c.getColumnIndex(HIT));
-            String time = c.getString(c.getColumnIndex(DATE));
-            int retry = c.getInt(c.getColumnIndex(RETRY));
-            if (hit != null && time != null) {
-                c.close();
-                db.close();
-                return new Hit(hit, new Date(Long.parseLong(time)), retry, true);
-            }
-            c.close();
-        }
-        db.close();
-        return null;
-    }
-}
\ No newline at end of file
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/TVTracking.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/TVTracking.java
index ccb97794..1a8ca890 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/TVTracking.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/TVTracking.java
@@ -27,16 +27,57 @@ of this software and associated documentation files (the "Software"), to deal
 import org.json.JSONException;
 import org.json.JSONObject;
 
+/**
+ * Wrapper class to enable TVTracking partner usage
+ */
 public class TVTracking {
 
     private final Tracker tracker;
     private String campaignURL;
     private int visitDuration;
 
+    TVTracking(Tracker tracker) {
+        this.tracker = tracker;
+        visitDuration = 10;
+        campaignURL = "";
+
+        String url = (String) tracker.getConfiguration().get(TrackerConfigurationKeys.TVTRACKING_URL);
+        if (!TextUtils.isEmpty(url)) {
+            campaignURL = url;
+        } else {
+            Tool.executeCallback(tracker.getListener(), Tool.CallbackType.warning, "TVTracking URL not set");
+        }
+
+        Integer visit = Integer.parseInt(String.valueOf(tracker.getConfiguration().get(TrackerConfigurationKeys.TVTRACKING_VISIT_DURATION)));
+        if (visit != 0) {
+            visitDuration = visit;
+        }
+
+        try {
+            String remanentCampaign = Tracker.getPreferences().getString(TrackerConfigurationKeys.REMANENT_CAMPAIGN_SAVED, null);
+            if (remanentCampaign != null) {
+                JSONObject remanentObject = new JSONObject(remanentCampaign);
+                int lifetime;
+                if (remanentObject.get("lifetime") instanceof String) {
+                    lifetime = Integer.parseInt((String) remanentObject.get("lifetime"));
+                } else {
+                    lifetime = (Integer) remanentObject.get("lifetime");
+                }
+                long savedLifetime = Tracker.getPreferences().getLong(TrackerConfigurationKeys.REMANENT_CAMPAIGN_TIME_SAVED, 0);
+
+                if (Tool.getDaysBetweenTimes(System.currentTimeMillis(), savedLifetime) >= lifetime) {
+                    Tracker.getPreferences().edit().putString(TrackerConfigurationKeys.REMANENT_CAMPAIGN_SAVED, null).apply();
+                }
+            }
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
+
     /**
-     * Get the Campaign URL
+     * Get the campaign url
      *
-     * @return String
+     * @return the TVTracking campaign url
      */
     public String getCampaignURL() {
         return campaignURL;
@@ -45,16 +86,16 @@ public String getCampaignURL() {
     /**
      * Get visit duration
      *
-     * @return int
+     * @return the TVTracking visit duration
      */
     public int getVisitDuration() {
         return visitDuration;
     }
 
     /**
-     * Set TVTracking data
+     * Attach TVTracking to tagging
      *
-     * @return Tracker
+     * @return Tracker instance
      */
     public Tracker set() {
         if (PluginParam.get(tracker).containsKey(Hit.HitParam.TVT.stringValue())) {
@@ -67,10 +108,10 @@ public Tracker set() {
     }
 
     /**
-     * Set TVTracking data
+     * Attach TVTracking to tagging
      *
-     * @param campaignURL String
-     * @return Tracker
+     * @param campaignURL campaign url
+     * @return Tracker instance
      */
     public Tracker set(String campaignURL) {
         this.campaignURL = campaignURL;
@@ -78,11 +119,11 @@ public Tracker set(String campaignURL) {
     }
 
     /**
-     * Set TVTracking data
+     * Attach TVTracking to tagging
      *
-     * @param campaignURL   String
-     * @param visitDuration int
-     * @return Tracker
+     * @param campaignURL   campaign url
+     * @param visitDuration campaign visit duration
+     * @return Tracker instance
      */
     public Tracker set(String campaignURL, int visitDuration) {
         this.visitDuration = visitDuration;
@@ -90,47 +131,9 @@ public Tracker set(String campaignURL, int visitDuration) {
     }
 
     /**
-     * Remove tvt parameter
+     * Detach TVTracking to tagging
      */
     public void unset() {
         tracker.unsetParam(Hit.HitParam.TVT.stringValue());
     }
-
-    TVTracking(Tracker tracker) {
-        this.tracker = tracker;
-        visitDuration = 10;
-        campaignURL = "";
-
-        String url = (String) tracker.getConfiguration().get(TrackerConfigurationKeys.TVTRACKING_URL);
-        if (!TextUtils.isEmpty(url)) {
-            campaignURL = url;
-        } else {
-            Tool.executeCallback(tracker.getListener(), Tool.CallbackType.warning, "TVTracking URL not set");
-        }
-
-        Integer visit = Integer.parseInt(String.valueOf(tracker.getConfiguration().get(TrackerConfigurationKeys.TVTRACKING_VISIT_DURATION)));
-        if (visit != 0) {
-            visitDuration = visit;
-        }
-
-        try {
-            String remanentCampaign = Tracker.getPreferences().getString(TrackerConfigurationKeys.REMANENT_CAMPAIGN_SAVED, null);
-            if (remanentCampaign != null) {
-                JSONObject remanentObject = new JSONObject(remanentCampaign);
-                int lifetime;
-                if (remanentObject.get("lifetime") instanceof String) {
-                    lifetime = Integer.parseInt((String) remanentObject.get("lifetime"));
-                } else {
-                    lifetime = (Integer) remanentObject.get("lifetime");
-                }
-                long savedLifetime = Tracker.getPreferences().getLong(TrackerConfigurationKeys.REMANENT_CAMPAIGN_TIME_SAVED, 0);
-
-                if (Tool.getDaysBetweenTimes(System.currentTimeMillis(), savedLifetime) >= lifetime) {
-                    Tracker.getPreferences().edit().putString(TrackerConfigurationKeys.REMANENT_CAMPAIGN_SAVED, null).apply();
-                }
-            }
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-    }
 }
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/TVTrackingPlugin.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/TVTrackingPlugin.java
deleted file mode 100644
index 9ebceab6..00000000
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/TVTrackingPlugin.java
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
-This SDK is licensed under the MIT license (MIT)
-Copyright (c) 2015- Applied Technologies Internet SAS (registration number B 403 261 258 - Trade and Companies Register of Bordeaux – France)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
- */
-package com.atinternet.tracker;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-import java.util.TimeZone;
-
-/**
- * TVTracking plugin
- */
-class TVTrackingPlugin extends Plugin {
-
-    /**
-     * Constant timeout
-     */
-    private static final int TIMEOUT = 5000;
-
-    /**
-     * Strings constant
-     */
-    private static final String DIRECT = "direct";
-    private static final String REMANENT = "remanent";
-    private static final String INFO = "info";
-    private static final String VERSION = "version";
-    private static final String VERSION_TVT_CODE = "1.2.2m";
-    private static final String MESSAGE = "message";
-    private static final String ERROR = "errors";
-    private static final String TVTRACKING = "tvtracking";
-    private static final String UNDEFINED = "undefined";
-    private static final String PRIORITY = "priority";
-    private static final String CHANNEL = "channel";
-    private static final String TIME = "time";
-    private static final String LIFETIME = "lifetime";
-
-    private static final String UTC_DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ss'Z'";
-
-    enum TVTrackingStatusCase {
-        channelUndefined, noChannel, noData, timeError, ok
-    }
-
-    @Override
-    protected void execute(Tracker tracker) {
-        this.tracker = tracker;
-        try {
-            if (sessionIsExpired()) {
-                setDirectCampaignToRemanent();
-
-                URL url = new URL(tracker.TVTracking().getCampaignURL());
-                HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-                connection.setReadTimeout(TIMEOUT);
-                connection.setConnectTimeout(TIMEOUT);
-                connection.setDoInput(true);
-                connection.connect();
-                response = getTvTrackingResponse(stringifyTvTResponse(connection), connection);
-                connection.disconnect();
-            } else {
-                response = getTvTrackingResponse(Tracker.getPreferences().getString(TrackerConfigurationKeys.DIRECT_CAMPAIGN_SAVED, null), null);
-            }
-            Tool.executeCallback(tracker.getListener(), Tool.CallbackType.partner, "TV Tracking : " + response);
-            Tracker.getPreferences().edit().putLong(TrackerConfigurationKeys.LAST_TVT_EXECUTE_TIME, System.currentTimeMillis()).apply();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Formatting data from HTTPResponse content
-     *
-     * @param connection HttpURLConnection
-     * @return String
-     */
-    private String stringifyTvTResponse(HttpURLConnection connection) throws IOException {
-        String result = null;
-        if (connection.getResponseCode() == 200) {
-            InputStream inputStream = connection.getInputStream();
-            if (inputStream != null) {
-                result = "";
-                BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
-                String line;
-                while ((line = reader.readLine()) != null) {
-                    result += line;
-                }
-                inputStream.close();
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Get formatted JSON TVTracking response
-     *
-     * @param directCampaign String
-     * @param connection     HttpURLConnection
-     * @return String
-     * @throws JSONException
-     */
-    private String getTvTrackingResponse(String directCampaign, HttpURLConnection connection) throws JSONException, IOException {
-        JSONObject resultJson = new JSONObject();
-
-        JSONObject tvtrackingObject = new JSONObject();
-        JSONObject infoObject;
-        String infoSaved = Tracker.getPreferences().getString(TrackerConfigurationKeys.INFO_CAMPAIGN_SAVED, null);
-
-        // if tvt send data
-        if (directCampaign != null) {
-            Object[] checkResult = checkCampaign(new JSONObject(directCampaign));
-            switch ((TVTrackingStatusCase) checkResult[0]) {
-                case noChannel:
-                    // invalid data
-                    infoObject = putInfos(infoSaved, TVTrackingStatusCase.noChannel, connection, null);
-                    break;
-                case channelUndefined:
-                    // no diffusion
-                    infoObject = putInfos(infoSaved, TVTrackingStatusCase.channelUndefined, connection, null);
-                    break;
-                case timeError:
-                    // Bad time
-                    infoObject = putInfos(infoSaved, TVTrackingStatusCase.timeError, connection, checkResult);
-                    break;
-                default:
-                    // valid campaign
-                    JSONObject directObject = (JSONObject) checkResult[1];
-                    Tracker.getPreferences().edit().putString(TrackerConfigurationKeys.DIRECT_CAMPAIGN_SAVED, directObject.toString()).apply();
-                    tvtrackingObject.put(DIRECT, directObject);
-                    infoObject = putInfos(infoSaved, TVTrackingStatusCase.ok, connection, checkResult);
-                    break;
-            }
-        } else {
-            infoObject = putInfos(infoSaved, TVTrackingStatusCase.noData, connection, null);
-        }
-        Tracker.getPreferences().edit().putString(TrackerConfigurationKeys.INFO_CAMPAIGN_SAVED, infoObject.toString()).apply();
-
-        String remanentCampaignSaved = Tracker.getPreferences().getString(TrackerConfigurationKeys.REMANENT_CAMPAIGN_SAVED, null);
-        if (remanentCampaignSaved != null) {
-            JSONObject remanentObject = new JSONObject(remanentCampaignSaved);
-            tvtrackingObject.put(REMANENT, remanentObject);
-        }
-
-        tvtrackingObject.put(INFO, infoObject);
-        return resultJson.put(TVTRACKING, tvtrackingObject).toString();
-    }
-
-    /**
-     * Set direct campaign to remanent campaignt
-     *
-     * @throws JSONException
-     */
-    private void setDirectCampaignToRemanent() throws JSONException {
-        String directCampaign = Tracker.getPreferences().getString(TrackerConfigurationKeys.DIRECT_CAMPAIGN_SAVED, null);
-        if (directCampaign != null) {
-            JSONObject directObject = new JSONObject(directCampaign);
-            String remanentCampaign = Tracker.getPreferences().getString(TrackerConfigurationKeys.REMANENT_CAMPAIGN_SAVED, null);
-            if (remanentCampaign != null) {
-                JSONObject remanentObject = new JSONObject(remanentCampaign);
-                int directPriority;
-                int remanentPriority;
-                if (directObject.get(PRIORITY) instanceof String) {
-                    directPriority = Integer.parseInt((String) directObject.get(PRIORITY));
-                } else {
-                    directPriority = (Integer) directObject.get(PRIORITY);
-                }
-                if (remanentObject.get(PRIORITY) instanceof String) {
-                    remanentPriority = Integer.parseInt((String) remanentObject.get(PRIORITY));
-                } else {
-                    remanentPriority = (Integer) remanentObject.get(PRIORITY);
-                }
-                if (directPriority == 1 || (directPriority == 0 && remanentPriority == 1)) {
-                    Tracker.getPreferences().edit().putString(TrackerConfigurationKeys.REMANENT_CAMPAIGN_SAVED, directCampaign).apply();
-                }
-            } else {
-                Tracker.getPreferences().edit().putString(TrackerConfigurationKeys.REMANENT_CAMPAIGN_SAVED, directCampaign).apply();
-            }
-            Tracker.getPreferences().edit().putLong(TrackerConfigurationKeys.REMANENT_CAMPAIGN_TIME_SAVED, System.currentTimeMillis())
-                    .putString(TrackerConfigurationKeys.DIRECT_CAMPAIGN_SAVED, null)
-                    .apply();
-        }
-        Tracker.getPreferences().edit().putString(TrackerConfigurationKeys.INFO_CAMPAIGN_SAVED, null).apply();
-    }
-
-    /**
-     * Check if campaign is valid
-     *
-     * @param response JSONObject
-     * @return JSONObject
-     * @throws JSONException
-     */
-    private Object[] checkCampaign(JSONObject response) throws JSONException {
-        // invalid data
-        if (!response.toString().contains(CHANNEL)) {
-            return new Object[]{TVTrackingStatusCase.noChannel, null};
-        }
-        // no diffusion
-        else if (response.get(CHANNEL).equals(UNDEFINED)) {
-            return new Object[]{TVTrackingStatusCase.channelUndefined, null};
-        } else {
-            if (response.get(PRIORITY).equals(UNDEFINED)) {
-                response.put(PRIORITY, "1");
-            }
-            if (response.get(LIFETIME).equals(UNDEFINED)) {
-                response.put(LIFETIME, "30");
-            }
-
-            String partnerTime = (String) response.get(TIME);
-            SimpleDateFormat sdf;
-            Date date = null;
-
-            // UTC
-            try {
-                sdf = new SimpleDateFormat(UTC_DATE_FORMAT, Locale.getDefault());
-                sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
-                date = sdf.parse(partnerTime);
-            } catch (ParseException e) {
-                e.printStackTrace();
-            }
-
-            if (date == null || Tool.getMinutesBetweenTimes(System.currentTimeMillis(), date.getTime()) > Integer.parseInt(String.valueOf(tracker.getConfiguration().get(TrackerConfigurationKeys.TVTRACKING_SPOT_VALIDITY_TIME)))) {
-                return new Object[]{TVTrackingStatusCase.timeError, partnerTime};
-            }
-        }
-        return new Object[]{TVTrackingStatusCase.ok, response};
-    }
-
-    /**
-     * Return true if session is expired
-     *
-     * @return boolean
-     */
-    private boolean sessionIsExpired() {
-        long lastHitSentTime = Tracker.getPreferences().getLong(TrackerConfigurationKeys.LAST_TVT_EXECUTE_TIME, 0);
-        return Tool.getSecondsBetweenTimes(System.currentTimeMillis(), lastHitSentTime) >= tracker.TVTracking().getVisitDuration() * 60;
-    }
-
-    /**
-     * Insert info object in tvt response
-     *
-     * @param infoSaved  String
-     * @param status     TVTrackingStatusCase
-     * @param connection HttpURLConnection
-     * @return JSONObject
-     * @throws JSONException
-     */
-    private JSONObject putInfos(String infoSaved, TVTrackingStatusCase status, HttpURLConnection connection, Object[] checkResult) throws JSONException, IOException {
-        // if session is not expired
-        if (infoSaved != null) {
-            return new JSONObject(infoSaved);
-        } else {
-            JSONObject infoObject = new JSONObject();
-            switch (status) {
-                case noChannel:
-                    // No channel
-                    return infoObject.put(VERSION, VERSION_TVT_CODE)
-                            .put(MESSAGE, String.valueOf(connection.getResponseCode()))
-                            .put(ERROR, "noChannel");
-                case channelUndefined:
-                    // Invalid campaign
-                    return infoObject.put(VERSION, VERSION_TVT_CODE)
-                            .put(MESSAGE, String.valueOf(connection.getResponseCode()) + "-channelUndefined")
-                            .put(ERROR, "");
-                case noData:
-                    // No campaign
-                    return infoObject.put(VERSION, VERSION_TVT_CODE)
-                            .put(MESSAGE, String.valueOf(connection.getResponseCode()))
-                            .put(ERROR, "noData");
-                case timeError:
-                    // Bad time
-                    return infoObject.put(VERSION, VERSION_TVT_CODE)
-                            .put(MESSAGE, String.valueOf(connection.getResponseCode()) + "-" + String.valueOf(checkResult[1]))
-                            .put(ERROR, "timeError");
-                default:
-                    // Valid campaign
-                    return infoObject.put(VERSION, VERSION_TVT_CODE)
-                            .put(MESSAGE, String.valueOf(connection.getResponseCode()))
-                            .put(ERROR, "");
-            }
-        }
-    }
-}
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/TechnicalContext.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/TechnicalContext.java
deleted file mode 100644
index 7241ef11..00000000
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/TechnicalContext.java
+++ /dev/null
@@ -1,427 +0,0 @@
-/*
-This SDK is licensed under the MIT license (MIT)
-Copyright (c) 2015- Applied Technologies Internet SAS (registration number B 403 261 258 - Trade and Companies Register of Bordeaux – France)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
- */
-package com.atinternet.tracker;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
-import android.graphics.Point;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.os.Build;
-import android.telephony.TelephonyManager;
-import android.util.DisplayMetrics;
-import android.view.Display;
-import android.view.WindowManager;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-import java.util.UUID;
-
-import static android.os.Build.BRAND;
-import static android.os.Build.MODEL;
-import static android.provider.Settings.Secure.ANDROID_ID;
-import static android.provider.Settings.Secure.getString;
-
-/**
- * Contextual information from user device
- */
-class TechnicalContext {
-
-    // Static variable to save screen name
-    static String screenName = "";
-
-    // Static variable to save level2
-    static int level2 = 0;
-
-    // Constant to retry get advertisingID
-    private static final int RETRY_GET_ADVERTISING_COUNT = 3;
-
-    // Constant android id key
-    private static final String ANDROID_ID_KEY = "androidId";
-
-    // Constant uuid key
-    private static final String UUID_KEY = "UUID";
-
-    /**
-     * Get the tag version
-     */
-    static final Closure VTAG = new Closure() {
-        @Override
-        public String execute() {
-            return "2.3.4";
-        }
-    };
-
-    /**
-     * Get the tag platform
-     */
-    static final Closure PTAG = new Closure() {
-        @Override
-        public String execute() {
-            return "Android";
-        }
-    };
-
-    /**
-     * Enum with all networks connections type
-     */
-    enum ConnectionType {
-        gprs, edge, twog, threeg, threegplus, fourg, wifi, offline, unknown
-    }
-
-    static ConnectionType getConnection() {
-        android.content.Context context = Tracker.getAppContext();
-        ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(android.content.Context.CONNECTIVITY_SERVICE);
-        NetworkInfo networkInfo = connectivityManager.getActiveNetworkInfo();
-
-        TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(android.content.Context.TELEPHONY_SERVICE);
-
-        if (networkInfo != null) {
-            if (networkInfo.getType() == ConnectivityManager.TYPE_WIFI) {
-                return ConnectionType.wifi;
-            } else {
-                switch (telephonyManager.getNetworkType()) {
-                    case TelephonyManager.NETWORK_TYPE_GPRS:
-                        return ConnectionType.gprs;
-                    case TelephonyManager.NETWORK_TYPE_EDGE:
-                        return ConnectionType.edge;
-                    case TelephonyManager.NETWORK_TYPE_1xRTT:
-                        return ConnectionType.twog;
-                    case TelephonyManager.NETWORK_TYPE_CDMA:
-                    case TelephonyManager.NETWORK_TYPE_UMTS:
-                    case TelephonyManager.NETWORK_TYPE_EVDO_0:
-                    case TelephonyManager.NETWORK_TYPE_EVDO_A:
-                    case TelephonyManager.NETWORK_TYPE_EVDO_B:
-                        return ConnectionType.threeg;
-                    case TelephonyManager.NETWORK_TYPE_HSPA:
-                    case TelephonyManager.NETWORK_TYPE_HSDPA:
-                    case TelephonyManager.NETWORK_TYPE_HSUPA:
-                        return ConnectionType.threegplus;
-                    case TelephonyManager.NETWORK_TYPE_HSPAP:
-                    case TelephonyManager.NETWORK_TYPE_LTE:
-                        return ConnectionType.fourg;
-                    default:
-                        return ConnectionType.unknown;
-                }
-            }
-        } else {
-            return ConnectionType.offline;
-        }
-    }
-
-    /**
-     * Get Connection type
-     *
-     * @return Closure
-     */
-    static Closure getConnectionType() {
-        return new Closure() {
-            @Override
-            public String execute() {
-                switch (getConnection()) {
-                    case gprs:
-                        return "gprs";
-                    case edge:
-                        return "edge";
-                    case twog:
-                        return "2g";
-                    case threeg:
-                        return "3g";
-                    case threegplus:
-                        return "3g+";
-                    case fourg:
-                        return "4g";
-                    case wifi:
-                        return "wifi";
-                    case unknown:
-                        return "unknown";
-                    default:
-                        return "offline";
-                }
-            }
-        };
-    }
-
-    /**
-     * Get the operator name
-     *
-     * @return Closure
-     */
-    static Closure getCarrier() {
-        return new Closure() {
-            @Override
-            public String execute() {
-                android.content.Context context = Tracker.getAppContext();
-                TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(android.content.Context.TELEPHONY_SERVICE);
-                return telephonyManager != null ? telephonyManager.getNetworkOperatorName() : "";
-            }
-        };
-    }
-
-    /**
-     * Get the device language
-     *
-     * @return Closure
-     */
-    static Closure getLanguage() {
-        return new Closure() {
-            @Override
-            public String execute() {
-                return Locale.getDefault() != null ? Locale.getDefault().toString().toLowerCase() : "";
-            }
-        };
-    }
-
-    /**
-     * Get device brand, model , api level and screen resolution
-     *
-     * @return Closure
-     */
-    static Closure getDevice() {
-        return new Closure() {
-            @Override
-            public String execute() {
-                return String.format("[%1$s]-[%2$s]", BRAND, Tool.removeCharacters(MODEL, " ", "-", ".").toLowerCase());
-            }
-        };
-    }
-
-    /**
-     * Get the OS version
-     *
-     * @return Closure
-     */
-    static Closure getOS() {
-        return new Closure() {
-            @Override
-            public String execute() {
-                return String.format("[android]-[%s]", Build.VERSION.RELEASE);
-            }
-        };
-    }
-
-    /**
-     * Get the local hour
-     *
-     * @return Closure
-     */
-    static Closure getLocalHour() {
-        return new Closure() {
-            @Override
-            public String execute() {
-                return new SimpleDateFormat("HH'x'mm'x'ss", Locale.getDefault()).format(new Date());
-            }
-        };
-    }
-
-    /**
-     * Get the application identifier
-     *
-     * @return Closure
-     */
-    static Closure getApplicationIdentifier() {
-        return new Closure() {
-            @Override
-            public String execute() {
-                return Tracker.getAppContext().getPackageName();
-            }
-        };
-    }
-
-    /**
-     * Get the application version
-     *
-     * @return Closure
-     */
-    static Closure getApplicationVersion() {
-        return new Closure() {
-            @Override
-            public String execute() {
-                android.content.Context context = Tracker.getAppContext();
-                String versionName = "";
-                try {
-                    if (context.getPackageManager() != null &&
-                            context.getPackageName() != null &&
-                            context.getPackageManager().getPackageInfo(context.getPackageName(), 0) != null) {
-
-                        versionName = context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionName;
-                    }
-                } catch (PackageManager.NameNotFoundException e) {
-                    e.printStackTrace();
-                }
-                return String.format("[%s]", versionName);
-            }
-        };
-    }
-
-    /**
-     * Get the device resolution
-     *
-     * @return Closure
-     */
-    static Closure getResolution() {
-        return new Closure() {
-            @Override
-            public String execute() {
-                android.content.Context context = Tracker.getAppContext();
-                DisplayMetrics displayMetrics = new DisplayMetrics();
-                ((WindowManager) context.getApplicationContext().getSystemService(android.content.Context.WINDOW_SERVICE)).getDefaultDisplay().getMetrics(displayMetrics);
-                return displayMetrics.widthPixels + "x" + displayMetrics.heightPixels;
-            }
-        };
-    }
-
-    /**
-     * Get diagonal
-     *
-     * @return Closure
-     */
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
-    static Closure getDiagonal() {
-        return new Closure() {
-            @Override
-            public String execute() {
-                DisplayMetrics metrics = new DisplayMetrics();
-                Display d = ((WindowManager) Tracker.getAppContext().getSystemService(Context.WINDOW_SERVICE))
-                        .getDefaultDisplay();
-                d.getMetrics(metrics);
-
-                // since SDK_INT = 1;
-                int widthPixels = metrics.widthPixels;
-                int heightPixels = metrics.heightPixels;
-
-                try {
-                    // includes window decorations (statusbar bar/menu bar)
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH && Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1) {
-                        widthPixels = (Integer) Display.class.getMethod("getRawWidth").invoke(d);
-                        heightPixels = (Integer) Display.class.getMethod("getRawHeight").invoke(d);
-                    }
-                    // includes window decorations (statusbar bar/menu bar)
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-                        Point realSize = new Point();
-                        d.getRealSize(realSize);
-
-                        widthPixels = realSize.x;
-                        heightPixels = realSize.y;
-
-                    }
-                } catch (Exception ignored) {
-                }
-
-                double x = Math.pow(widthPixels / metrics.xdpi, 2);
-                double y = Math.pow(heightPixels / metrics.ydpi, 2);
-
-
-                return String.format(Locale.getDefault(), "%.1f", Math.sqrt(x + y));
-            }
-        };
-    }
-
-    /**
-     * Get the download SDK source
-     *
-     * @return Closure
-     */
-    static Closure getDownloadSource(final Tracker tracker) {
-        return new Closure() {
-            @Override
-            public String execute() {
-                Object dls = tracker.getConfiguration().get(TrackerConfigurationKeys.DOWNLOAD_SOURCE);
-                if (dls != null) {
-                    return String.valueOf(dls);
-                } else {
-                    return "ext";
-                }
-            }
-        };
-    }
-
-    /**
-     * Get the user ID
-     *
-     * @param identifier String
-     * @return Closure
-     */
-    static Closure getUserId(final String identifier) {
-        return new Closure() {
-            @Override
-            public String execute() {
-                final android.content.Context context = Tracker.getAppContext();
-                SharedPreferences preferences = context.getSharedPreferences(TrackerConfigurationKeys.PREFERENCES, Context.MODE_PRIVATE);
-
-                if (preferences.getBoolean(TrackerConfigurationKeys.DO_NOT_TRACK_ENABLED, false)) {
-                    return "opt-out";
-                } else if (identifier.equals(ANDROID_ID_KEY)) {
-                    return getString(context.getContentResolver(), ANDROID_ID);
-                } else if (identifier.equals(UUID_KEY)) {
-                    String uuid = preferences.getString(TrackerConfigurationKeys.IDCLIENT_UUID, null);
-                    if (uuid == null) {
-                        uuid = UUID.randomUUID().toString();
-                        preferences.edit().putString(TrackerConfigurationKeys.IDCLIENT_UUID, uuid).apply();
-                    }
-                    return uuid;
-                } else {
-                    try {
-                        com.google.android.gms.ads.identifier.AdvertisingIdClient.Info adInfo = null;
-                        int count = 0;
-                        while (adInfo == null && count < RETRY_GET_ADVERTISING_COUNT) {
-                            adInfo = com.google.android.gms.ads.identifier.AdvertisingIdClient.getAdvertisingIdInfo(context);
-                            count++;
-                        }
-                        if (adInfo != null && !adInfo.isLimitAdTrackingEnabled()) {
-                            return adInfo.getId();
-                        } else {
-                            return "opt-out";
-                        }
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                        return "";
-                    }
-                }
-            }
-        };
-    }
-
-    /**
-     * Enable or disable tracking
-     *
-     * @param context Context
-     * @param enabled boolean
-     */
-    static void doNotTrack(android.content.Context context, boolean enabled) {
-        context.getSharedPreferences(TrackerConfigurationKeys.PREFERENCES, android.content.Context.MODE_PRIVATE).edit().putBoolean(TrackerConfigurationKeys.DO_NOT_TRACK_ENABLED, enabled).apply();
-    }
-
-    /**
-     * Tracking enabled or disabled
-     *
-     * @param context Context
-     * @return boolean
-     */
-    static boolean doNotTrackEnabled(android.content.Context context) {
-        return context.getSharedPreferences(TrackerConfigurationKeys.PREFERENCES, android.content.Context.MODE_PRIVATE).getBoolean(TrackerConfigurationKeys.DO_NOT_TRACK_ENABLED, false);
-    }
-}
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Tool.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Tool.java
deleted file mode 100644
index 38e9701c..00000000
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Tool.java
+++ /dev/null
@@ -1,486 +0,0 @@
-/*
-This SDK is licensed under the MIT license (MIT)
-Copyright (c) 2015- Applied Technologies Internet SAS (registration number B 403 261 258 - Trade and Companies Register of Bordeaux – France)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
- */
-package com.atinternet.tracker;
-
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.text.TextUtils;
-import android.view.View;
-import android.view.animation.AlphaAnimation;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URL;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-import java.security.MessageDigest;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import static android.content.res.Configuration.SCREENLAYOUT_SIZE_LARGE;
-import static android.content.res.Configuration.SCREENLAYOUT_SIZE_MASK;
-import static com.atinternet.tracker.Tracker.*;
-import static com.atinternet.tracker.TrackerListener.HitStatus;
-
-/**
- * Class to stock tool functions
- */
-class Tool {
-
-    enum CallbackType {
-        firstLaunch, build, send, partner, warning, save, error
-    }
-
-    /**
-     * Encoding a string
-     *
-     * @param s String
-     * @return String
-     */
-    static String percentEncode(String s) {
-        try {
-            s = URLEncoder.encode(s, "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-        return s.replace("+", "%20")
-                .replace("*", "%2A")
-                .replace("-", "%2D")
-                .replace(".", "%2E")
-                .replace("_", "%5F");
-    }
-
-    /**
-     * Decoding a string
-     *
-     * @param s String
-     * @return String
-     */
-    static String percentDecode(String s) {
-        try {
-            s = URLDecoder.decode(s, "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-        return s;
-    }
-
-    /**
-     * Remove characters into a string
-     *
-     * @param s               String
-     * @param charTobeRemoved String...
-     * @return String
-     */
-    static String removeCharacters(String s, String... charTobeRemoved) {
-        String result = s;
-        for (String c : charTobeRemoved) {
-            result = result.replace(c, "");
-        }
-        return result;
-    }
-
-    /**
-     * Convert object to string
-     *
-     * @param value     Object
-     * @param separator String
-     * @return String
-     */
-    static String convertToString(Object value, String separator) {
-        separator = (!TextUtils.isEmpty(separator)) ? separator : ",";
-        String result = "";
-        boolean isFirst = true;
-
-        if (value != null) {
-            if (value instanceof List) {
-                List<Object> listResult = (List<Object>) value;
-                for (Object object : listResult) {
-                    value = object;
-                    if (isFirst) {
-                        result = convertToString(value, separator);
-                        isFirst = false;
-                    } else {
-                        result += separator + convertToString(value, separator);
-                    }
-                }
-            } else if (value instanceof Object[]) {
-                Object[] objects = (Object[]) value;
-                value = Arrays.asList(objects);
-                return convertToString(value, separator);
-            } else if (value instanceof Map) {
-                result = new JSONObject((Map) value).toString();
-            } else {
-                result = String.valueOf(value);
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * Find parameter position and the array index
-     *
-     * @param searchKey  String
-     * @param parameters ArrayList<Param>
-     * @return ArrayList
-     */
-    @SafeVarargs
-    static ArrayList<int[]> findParameterPosition(String searchKey, ArrayList<Param>... parameters) {
-        ArrayList<int[]> indexes = new ArrayList<>();
-        int indexValue = 0;
-        int idArray = 0;
-
-        for (ArrayList<Param> array : parameters) {
-            for (Param p : array) {
-                if (p.getKey().equals(searchKey)) {
-                    indexes.add(new int[]{idArray, indexValue});
-                }
-                indexValue++;
-            }
-            idArray++;
-            indexValue = 0;
-        }
-
-        return indexes;
-    }
-
-    /**
-     * Get the timestamp
-     *
-     * @return Closure
-     */
-    static Closure getTimeStamp() {
-        return new Closure() {
-            @Override
-            public String execute() {
-
-                double result = System.currentTimeMillis() / 1000.0;
-                long d = (long) result;
-                String afterZero = Double.toString(result - d);
-
-                return afterZero.length() > 1 ? Long.toString(d) + afterZero.substring(1) : "";
-            }
-        };
-    }
-
-    static boolean isTablet(Context context) {
-        return (context.getResources().getConfiguration().screenLayout & SCREENLAYOUT_SIZE_MASK) >= SCREENLAYOUT_SIZE_LARGE;
-    }
-
-
-    static OfflineMode convertStringToOfflineMode(String offlineMode) {
-        switch (offlineMode) {
-            case "always":
-                return OfflineMode.always;
-            case "never":
-                return OfflineMode.never;
-            default:
-                return OfflineMode.required;
-        }
-    }
-
-    /**
-     * Function to execute callback
-     *
-     * @param trackerListener TrackerListener
-     * @param callbackType    CallbackType
-     * @param message         String
-     * @param hitStatuses     HitStatus
-     */
-    static void executeCallback(TrackerListener trackerListener, CallbackType callbackType, String message, HitStatus... hitStatuses) {
-        if (trackerListener != null) {
-            switch (callbackType) {
-                case firstLaunch:
-                    trackerListener.trackerNeedsFirstLaunchApproval(message);
-                    break;
-                case build:
-                    trackerListener.buildDidEnd(hitStatuses[0], message);
-                    break;
-                case send:
-                    trackerListener.sendDidEnd(hitStatuses[0], message);
-                    break;
-                case partner:
-                    trackerListener.didCallPartner(message);
-                    break;
-                case warning:
-                    trackerListener.warningDidOccur(message);
-                    break;
-                case save:
-                    trackerListener.saveDidEnd(message);
-                    break;
-                default://error
-                    trackerListener.errorDidOccur(message);
-                    break;
-            }
-        }
-    }
-
-    /**
-     * Get days count between two millis time
-     *
-     * @param latestTimeMillis long
-     * @param oldestTimeMillis long
-     * @return int
-     */
-    static int getDaysBetweenTimes(long latestTimeMillis, long oldestTimeMillis) {
-        return (int) TimeUnit.DAYS.convert((latestTimeMillis - oldestTimeMillis), TimeUnit.MILLISECONDS);
-    }
-
-    /**
-     * Get minutes count between two millis time
-     *
-     * @param latestTimeMillis long
-     * @param oldestTimeMillis long
-     * @return int
-     */
-    static int getMinutesBetweenTimes(long latestTimeMillis, long oldestTimeMillis) {
-        return (int) TimeUnit.MINUTES.convert((latestTimeMillis - oldestTimeMillis), TimeUnit.MILLISECONDS);
-    }
-
-    /**
-     * Get seconds count between two millis time
-     *
-     * @param latestTimeMillis long
-     * @param oldestTimeMillis long
-     * @return int
-     */
-    static int getSecondsBetweenTimes(long latestTimeMillis, long oldestTimeMillis) {
-        return (int) TimeUnit.SECONDS.convert((latestTimeMillis - oldestTimeMillis), TimeUnit.MILLISECONDS);
-    }
-
-    /**
-     * Add 0 to have length (mh parameter)
-     *
-     * @param s      String
-     * @param length int
-     * @return String
-     */
-    static String formatNumberLength(String s, int length) {
-        String result = "";
-        for (int i = s.length(); i < length; i++) {
-            result += "0";
-        }
-        return result + s;
-    }
-
-    /**
-     * Convert String to JSON
-     *
-     * @param s String
-     * @return Object
-     */
-    static Object parseJSON(String s) {
-        try {
-            return new JSONObject(s);
-        } catch (JSONException e) {
-            try {
-                return new JSONArray(s);
-            } catch (JSONException e1) {
-                return null;
-            }
-        }
-    }
-
-    /**
-     * Convert a JSONObject to Map
-     *
-     * @param jsonObject JSONObject
-     * @return Map
-     */
-    static Map toMap(JSONObject jsonObject) {
-        Map<String, Object> map = new HashMap<>();
-
-        Iterator<String> keysItr = jsonObject.keys();
-        while (keysItr.hasNext()) {
-            String key = keysItr.next();
-            Object value = null;
-            try {
-                value = jsonObject.get(key);
-            } catch (JSONException e) {
-                e.printStackTrace();
-            }
-            map.put(key, value);
-        }
-        return map;
-    }
-
-    /**
-     * Return a appended String
-     *
-     * @param key              String
-     * @param volatileParams   ArrayList<Param>
-     * @param persistentParams ArrayList<Param>
-     * @return String
-     */
-    static String appendParameterValues(String key, ArrayList<Param> volatileParams, ArrayList<Param> persistentParams) {
-        ArrayList<int[]> indexPositions = Tool.findParameterPosition(key, volatileParams, persistentParams);
-        boolean isFirst = true;
-        String result = "";
-        for (int[] index : indexPositions) {
-            Param param = index[0] == 0 ? volatileParams.get(index[1]) : persistentParams.get(index[1]);
-            if (isFirst) {
-                result = param.getValue().execute();
-                isFirst = false;
-            } else if (param.getOptions() != null) {
-                result += param.getOptions().getSeparator() + param.getValue().execute();
-            } else {
-                result += "," + param.getValue().execute();
-            }
-        }
-        return result;
-    }
-
-    /**
-     * SHA-256 hash
-     *
-     * @param s String
-     * @return String
-     */
-    static String SHA_256(String s) {
-        String baseString = "AT" + s;
-        String result = "";
-        try {
-            MessageDigest md;
-            md = MessageDigest.getInstance("SHA-256");
-            md.update(baseString.getBytes());
-
-            byte byteData[] = md.digest();
-
-            for (byte aByteData : byteData) {
-                String hex = Integer.toHexString(0xff & aByteData);
-                if (hex.length() == 1) {
-                    result += "0";
-                }
-                result += hex;
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return result;
-    }
-
-    /**
-     * Resize an image
-     *
-     * @param imageID int
-     * @param context Context
-     * @param width   int
-     * @param height  int
-     * @return Drawable
-     */
-    static Drawable getResizedImage(int imageID, Context context, int width, int height) {
-        Bitmap b = BitmapFactory.decodeResource(context.getResources(), imageID);
-        Bitmap bitmapResized = Bitmap.createScaledBitmap(b, width, height, false);
-        return new BitmapDrawable(context.getResources(), bitmapResized);
-    }
-
-    /**
-     * Helper to create alpha animation
-     *
-     * @param view    View
-     * @param visible boolean
-     */
-    static void setVisibleViewWithAnimation(View view, boolean visible) {
-        AlphaAnimation animation;
-        if (visible) {
-            view.setVisibility(View.VISIBLE);
-            animation = new AlphaAnimation(0.f, 1.f);
-        } else {
-            view.setVisibility(View.GONE);
-            animation = new AlphaAnimation(1.f, 0.f);
-        }
-        animation.setDuration(400);
-        view.startAnimation(animation);
-    }
-
-    /**
-     * Get parameters
-     *
-     * @param hit String
-     * @return HashMap
-     */
-    static LinkedHashMap<String, String> getParameters(String hit) {
-        LinkedHashMap<String, String> map = new LinkedHashMap<>();
-        try {
-            URL url = new URL(hit);
-            map.put("ssl", url.getProtocol().equals("http") ? "Off" : "On");
-            map.put("log", url.getHost());
-            String[] queryComponents = url.getQuery().split("&");
-            for (String queryComponent : queryComponents) {
-                String[] elem = queryComponent.split("=");
-                if (elem.length > 1) {
-                    elem[1] = Tool.percentDecode(elem[1]);
-                    if (Tool.parseJSON(elem[1]) instanceof JSONObject) {
-                        JSONObject json = (JSONObject) Tool.parseJSON(elem[1]);
-                        if (json != null && elem[0].equals(Hit.HitParam.JSON.stringValue())) {
-                            map.put(elem[0], json.toString(3));
-                        } else {
-                            map.put(elem[0], elem[1]);
-                        }
-                    } else {
-                        map.put(elem[0], elem[1]);
-                    }
-                } else {
-                    map.put(elem[0], "");
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return map;
-    }
-
-    /**
-     * Get color from resources
-     *
-     * @param context Context
-     * @param colorId int
-     * @return int
-     */
-    @SuppressWarnings("deprecation")
-    @SuppressLint("deprecation")
-    @TargetApi(Build.VERSION_CODES.M)
-    static int getColor(Context context, int colorId) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            return context.getResources().getColor(colorId, null);
-        } else {
-            return context.getResources().getColor(colorId);
-        }
-    }
-}
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Tracker.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Tracker.java
index 4ff46f35..410d4925 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Tracker.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Tracker.java
@@ -37,23 +37,45 @@ of this software and associated documentation files (the "Software"), to deal
 import java.util.Map;
 import java.util.Set;
 
-import static com.atinternet.tracker.Param.Type;
-import static com.atinternet.tracker.Tool.CallbackType;
-
+/**
+ * Wrapper class for tracking usage of your application
+ */
 public class Tracker {
 
     /**
      * Enum for different offline mode
      */
     public enum OfflineMode {
-        never, required, always
+        /**
+         * hits are never stored
+         */
+        never,
+        /**
+         * hits are stored if no connection available
+         */
+        required,
+        /**
+         * hits are always stored
+         */
+        always
     }
 
     /**
      * Enum for different identifier
      */
     public enum IdentifierType {
-        androidId, advertisingId, UUID
+        /**
+         * provided by OS which is device identifier
+         */
+        androidId,
+        /**
+         * provided by GoogleAds
+         */
+        advertisingId,
+        /**
+         * Generated by ATInternet and stored in application data
+         */
+        UUID
     }
 
     /**
@@ -63,188 +85,230 @@ public enum PluginKey {
         tvtracking, nuggad
     }
 
-    /**
-     * Context
-     */
-    private static WeakReference<android.content.Context> appContext;
-
-    /**
-     * Crash Default Handler
-     */
+    protected static WeakReference<android.content.Context> appContext;
     private static Thread.UncaughtExceptionHandler defaultCrashHandler;
+    private static boolean isTrackerActivityLifeCycleEnabled = false;
+    private static Storage storage;
 
-    /**
-     * Listener for callbacks
-     */
-    private TrackerListener listener;
-
-    /**
-     * Listener for callbacks
-     */
+    protected TrackerListener listener;
     private Dispatcher dispatcher;
-
-    /**
-     * Contains parameters
-     */
     private Buffer buffer;
-
-    /**
-     * User Id member
-     */
     private String internalUserId;
-
-    /**
-     * Contains Tracker configuration
-     */
-    private Configuration configuration;
-
-    /**
-     * Storage offline hits
-     */
-    private static Storage storage;
-
-    /**
-     * Business Object
-     */
+    protected Configuration configuration;
     private final LinkedHashMap<String, BusinessObject> businessObjects = new LinkedHashMap<>();
 
-    /**
-     * Screen tracking
-     */
     private Screens screens;
-
-    /**
-     * Gestures tracking
-     */
     private Gestures gestures;
-
-    /**
-     * Event tracking
-     */
     private Event event;
-
-    /**
-     * Context tracking
-     */
     private Context context;
-
-    /**
-     * TV tracking
-     */
     private TVTracking tvTracking;
-
-    /**
-     * NuggAd
-     */
     private NuggAds nuggAds;
-
-    /**
-     * Offline management
-     */
     private Offline offline;
-
-    /**
-     * Custom Objects
-     */
     private CustomObjects customObjects;
-
-    /**
-     * IdentifiedVisitor tracking
-     */
     private IdentifiedVisitor identifiedVisitor;
-
-    /**
-     * Publisher tracking
-     */
     private Publishers publishers;
-
-    /**
-     * SelfPromotion tracking
-     */
     private SelfPromotions selfPromotions;
-
-    /**
-     * GPS tracking
-     */
     private Locations locations;
-
-    /**
-     * Custom variables
-     */
     private CustomVars customVars;
-
-    /**
-     * Orders
-     */
     private Orders orders;
-
-    /**
-     * Cart
-     */
     private Cart cart;
-
-    /**
-     * Aisles
-     */
     private Aisles aisles;
-
-    /**
-     * Campaigns
-     */
     private Campaigns campaigns;
-
-    /**
-     * InternalSearches
-     */
     private InternalSearches internalSearches;
-
-    /**
-     * DynamicScreens
-     */
     private DynamicScreens dynamicScreens;
-
-    /**
-     * Custom tree Structures
-     */
     private CustomTreeStructures customTreeStructures;
-
-    /**
-     * Products
-     */
     private Products products;
-
-    /**
-     * Players
-     */
     private MediaPlayers mediaPlayers;
 
-    /**
-     * Boolean to detect if activity lifecycle tracking is enabled
-     */
-    private static boolean isTrackerActivityLifeCycleEnabled = false;
+    Buffer getBuffer() {
+        return buffer;
+    }
+
+    static Storage getStorage() {
+        return storage;
+    }
+
+    LinkedHashMap<String, BusinessObject> getBusinessObjects() {
+        return businessObjects;
+    }
+
+    Dispatcher getDispatcher() {
+        return dispatcher;
+    }
+
+    static android.content.Context getAppContext() {
+        return appContext.get();
+    }
+
+    static SharedPreferences getPreferences() {
+        return appContext.get().getSharedPreferences(TrackerConfigurationKeys.PREFERENCES, android.content.Context.MODE_PRIVATE);
+    }
+
+    String getInternalUserId() {
+        return internalUserId;
+    }
+
+    void setInternalUserId(String internalUserId) {
+        this.internalUserId = internalUserId;
+    }
+
+    @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH)
+    private void setTrackerActivityLifecycle() {
+        isTrackerActivityLifeCycleEnabled = true;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH && appContext.get() instanceof Application) {
+            ((Application) appContext.get()).registerActivityLifecycleCallbacks(new TrackerActivityLifeCycle(configuration));
+        }
+    }
+
+    private void initTracker() {
+        try {
+            listener = null;
+            defaultCrashHandler = Thread.getDefaultUncaughtExceptionHandler();
+            storage = new Storage(appContext.get());
+            storage.setOfflineMode(Tool.convertStringToOfflineMode((String) configuration.get(TrackerConfigurationKeys.OFFLINE_MODE)));
+            buffer = new Buffer(this);
+            dispatcher = new Dispatcher(this);
+            if ((Boolean) configuration.get(TrackerConfigurationKeys.ENABLE_CRASH_DETECTION) && !(Thread.getDefaultUncaughtExceptionHandler() instanceof CrashDetectionHandler)) {
+                Thread.setDefaultUncaughtExceptionHandler(new CrashDetectionHandler(appContext.get(), defaultCrashHandler));
+            }
+            getPreferences().edit().putBoolean(TrackerConfigurationKeys.CAMPAIGN_ADDED_KEY, false).apply();
+
+            if (!isTrackerActivityLifeCycleEnabled) {
+                setTrackerActivityLifecycle();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private Tracker processSetParam(String key, Closure value) {
+        // Check whether the parameter is not in read only mode
+        if (!Lists.getReadOnlyParams().contains(key)) {
+            buffer.getVolatileParams().put(key, new Param(key, value));
+        } else {
+            Tool.executeCallback(listener, Tool.CallbackType.warning, String.format("Param %s is read only. Value will not be updated", key));
+        }
+
+        return this;
+    }
+
+    private Tracker processSetParam(String key, Closure value, ParamOption newParamOptions) {
+        // Check whether the parameter is not in read only mode
+        if (!Lists.getReadOnlyParams().contains(key)) {
+            Param newParam = new Param(key, value, newParamOptions);
+            List<Closure> newValues = new ArrayList<>();
+
+            if (newParam.isPersistent()) {
+                if (newParamOptions.isAppend()) {
+                    Param existingParam;
+                    if ((existingParam = buffer.getPersistentParams().get(key)) != null) {
+                        newValues = existingParam.getValues();
+                    }
+                    if ((existingParam = buffer.getVolatileParams().get(key)) != null) {
+                        existingParam.getValues().add(value);
+                    }
+                } else {
+                    buffer.getVolatileParams().remove(key);
+                }
+                newValues.add(value);
+                newParam.setValues(newValues);
+                buffer.getPersistentParams().put(key, newParam);
+            } else {
+                if (newParamOptions.isAppend()) {
+                    Param existingParam;
+                    if ((existingParam = buffer.getVolatileParams().get(key)) != null) {
+                        newValues = existingParam.getValues();
+                    } else if ((existingParam = buffer.getPersistentParams().get(key)) != null) {
+                        newValues = new ArrayList<>(existingParam.getValues());
+                    }
+                }
+                newValues.add(value);
+                newParam.setValues(newValues);
+                buffer.getVolatileParams().put(key, newParam);
+            }
+        } else {
+            Tool.executeCallback(listener, Tool.CallbackType.warning, String.format("Param %s is read only. Value will not be updated", key));
+        }
+
+        return this;
+    }
+
+    Tracker setParam(String key, Closure value) {
+        return processSetParam(key, value);
+    }
+
+    Tracker setParam(String key, Closure value, ParamOption options) {
+        return processSetParam(key, value, options);
+    }
+
+    private void refreshConfigurationDependencies() {
+        String identifierKey = String.valueOf(configuration.get(TrackerConfigurationKeys.IDENTIFIER));
+        String offlineMode = String.valueOf(configuration.get(TrackerConfigurationKeys.OFFLINE_MODE));
+        boolean enableCrashDetectionHandler = Boolean.parseBoolean(String.valueOf(configuration.get(TrackerConfigurationKeys.ENABLE_CRASH_DETECTION)));
+
+        if (!TextUtils.isEmpty(identifierKey)) {
+            buffer.setIdentifierKey(identifierKey);
+        }
+        if (!TextUtils.isEmpty(offlineMode)) {
+            storage.setOfflineMode(Tool.convertStringToOfflineMode(offlineMode));
+        }
+
+        if (enableCrashDetectionHandler) {
+            if (!(Thread.getDefaultUncaughtExceptionHandler() instanceof CrashDetectionHandler)) {
+                Thread.setDefaultUncaughtExceptionHandler(new CrashDetectionHandler(appContext.get(), defaultCrashHandler));
+            }
+        } else {
+            if (Thread.getDefaultUncaughtExceptionHandler() instanceof CrashDetectionHandler) {
+                Thread.setDefaultUncaughtExceptionHandler(defaultCrashHandler);
+            }
+        }
+    }
+
+    private Tracker handleNotClosureStringParameterSetting(String key, final Object value, final ParamOption... options) {
+        Closure stringValue = new Closure() {
+            @Override
+            public String execute() {
+                return Tool.convertToString(value, options.length > 0 ? options[0].getSeparator() : ",");
+            }
+        };
+        if (options.length > 0) {
+            return processSetParam(key, stringValue, options[0]);
+        } else {
+            return processSetParam(key, stringValue);
+        }
+    }
+
+    private void dispatchObjects(ArrayList<BusinessObject> objects, ArrayList<BusinessObject> customObjects) {
+        if (!objects.isEmpty()) {
+            objects.addAll(customObjects);
+            dispatcher.dispatch((BusinessObject[]) objects.toArray(new BusinessObject[objects.size()]));
+            customObjects.clear();
+            objects.clear();
+        }
+    }
 
     /**
-     * Get the current configuration
+     * Get the current tracker configuration
      *
-     * @return LinkedHashMap
+     * @return the current tracker configuration
      */
     public Configuration getConfiguration() {
         return configuration;
     }
 
     /**
-     * Get the listener of the tracker instance
+     * Get the current tracker listener
      *
-     * @return TrackerListener
+     * @return the current tracker listener
      */
     public TrackerListener getListener() {
         return listener;
     }
 
     /**
-     * Asynchronous method to get user ID for webview
+     * Asynchronous method to get user ID
      *
-     * @param callback UserIdCallback
+     * @param callback UserIdCallback: Called when user ID is available
      */
     public void getUserId(final UserIdCallback callback) {
         TrackerQueue.getInstance().put(new Runnable() {
@@ -258,7 +322,7 @@ public void run() {
                         callback.receiveUserId(userID);
                     }
                 } else {
-                    Tool.executeCallback(listener, CallbackType.warning, "Enabled to get user id");
+                    Tool.executeCallback(listener, Tool.CallbackType.warning, "Enabled to get user id");
                 }
             }
         });
@@ -267,19 +331,28 @@ public void run() {
     /**
      * Get user id (require one hit sent)
      *
-     * @return String
+     * @return the user ID
      */
     public String getUserIdSync() {
         if (internalUserId == null) {
-            Tool.executeCallback(listener, CallbackType.warning, "User id must be set");
+            Tool.executeCallback(listener, Tool.CallbackType.warning, "User id must be set");
         }
         return internalUserId;
     }
 
     /**
-     * Get Screen instance
+     * Set a custom user Id
+     *
+     * @param value new userId value
+     */
+    public void setUserId(String value) {
+        handleNotClosureStringParameterSetting(Hit.HitParam.UserId.stringValue(), value, new ParamOption().setPersistent(true));
+    }
+
+    /**
+     * Get Screens instance
      *
-     * @return Screens
+     * @return Screens instance
      */
     public Screens Screens() {
         return screens == null ? (screens = new Screens(this)) : screens;
@@ -288,7 +361,7 @@ public Screens Screens() {
     /**
      * Get Gestures instance
      *
-     * @return Gestures
+     * @return Gestures instance
      */
     public Gestures Gestures() {
         return gestures == null ? (gestures = new Gestures(this)) : gestures;
@@ -306,7 +379,7 @@ Event Event() {
     /**
      * Get Offline instance
      *
-     * @return Offline
+     * @return Offline instance
      */
     public Offline Offline() {
         return offline == null ? (offline = new Offline(this)) : offline;
@@ -315,7 +388,7 @@ public Offline Offline() {
     /**
      * Get Context instance
      *
-     * @return Context
+     * @return Context instance
      */
     public Context Context() {
         return context == null ? (context = new Context(this)) : context;
@@ -324,7 +397,7 @@ public Context Context() {
     /**
      * Get TVTracking instance
      *
-     * @return TVTracking
+     * @return TVTracking instance
      */
     public TVTracking TVTracking() {
         return tvTracking == null ? (tvTracking = new TVTracking(this)) : tvTracking;
@@ -333,16 +406,16 @@ public TVTracking TVTracking() {
     /**
      * Get NuggAd instance
      *
-     * @return NuggAd
+     * @return NuggAd instance
      */
     public NuggAds NuggAds() {
         return nuggAds == null ? (nuggAds = new NuggAds(this)) : nuggAds;
     }
 
     /**
-     * Get Custom objects instance
+     * Get CustomObjects instance
      *
-     * @return CustomObjects
+     * @return CustomObjects instance
      */
     public CustomObjects CustomObjects() {
         return customObjects == null ? (customObjects = new CustomObjects(this)) : customObjects;
@@ -351,7 +424,7 @@ public CustomObjects CustomObjects() {
     /**
      * Get IdentifiedVisitor instance
      *
-     * @return IdentifiedVisitor
+     * @return IdentifiedVisitor instance
      */
     public IdentifiedVisitor IdentifiedVisitor() {
         return identifiedVisitor == null ? (identifiedVisitor = new IdentifiedVisitor(this)) : identifiedVisitor;
@@ -360,7 +433,7 @@ public IdentifiedVisitor IdentifiedVisitor() {
     /**
      * Get Publishers instance
      *
-     * @return Publishers
+     * @return Publishers instance
      */
     public Publishers Publishers() {
         return publishers == null ? (publishers = new Publishers(this)) : publishers;
@@ -369,16 +442,16 @@ public Publishers Publishers() {
     /**
      * Get SelfPromotions instance
      *
-     * @return SelfPromotions
+     * @return SelfPromotions instance
      */
     public SelfPromotions SelfPromotions() {
         return selfPromotions == null ? (selfPromotions = new SelfPromotions(this)) : selfPromotions;
     }
 
     /**
-     * Get DynamicLabels instance
+     * Get DynamicScreens instance
      *
-     * @return DynamicScreens
+     * @return DynamicScreens instance
      */
     public DynamicScreens DynamicScreens() {
         return dynamicScreens == null ? (dynamicScreens = new DynamicScreens(this)) : dynamicScreens;
@@ -387,7 +460,7 @@ public DynamicScreens DynamicScreens() {
     /**
      * Get Products instance
      *
-     * @return Products
+     * @return Products instance
      */
     public Products Products() {
         return products == null ? (products = new Products(this)) : products;
@@ -396,25 +469,25 @@ public Products Products() {
     /**
      * Get Cart instance
      *
-     * @return Cart
+     * @return Cart instance
      */
     public Cart Cart() {
         return cart == null ? (cart = new Cart(this)) : cart;
     }
 
     /**
-     * Get Players instance
+     * Get MediaPlayers instance
      *
-     * @return Players
+     * @return MediaPlayers instance
      */
     public MediaPlayers Players() {
         return mediaPlayers == null ? (mediaPlayers = new MediaPlayers(this)) : mediaPlayers;
     }
 
     /**
-     * Get GPS instance
+     * Get Locations instance
      *
-     * @return GPS
+     * @return Locations instance
      * @deprecated Since 2.3.0, Location is now only available as a screen object property.
      */
     @Deprecated
@@ -425,7 +498,7 @@ public Locations Locations() {
     /**
      * Get CustomVars instance
      *
-     * @return CustomVars
+     * @return CustomVars instance
      * @deprecated Since 2.3.0, CustomVars is now only available as a screen object property.
      */
     @Deprecated
@@ -436,7 +509,7 @@ public CustomVars CustomVars() {
     /**
      * Get Aisles instance
      *
-     * @return Aisles
+     * @return Aisles instance
      * @deprecated Since 2.3.0, Aisles is now only available as a screen object property.
      */
     @Deprecated
@@ -447,10 +520,8 @@ public Aisles Aisles() {
     /**
      * Get Campaigns instance
      *
-     * @return Campaigns
-     * @deprecated Since 2.3.0, Campaign is now only available as a screen object property.
+     * @return Campaigns instance
      */
-    @Deprecated
     public Campaigns Campaigns() {
         return campaigns == null ? (campaigns = new Campaigns(this)) : campaigns;
     }
@@ -458,7 +529,7 @@ public Campaigns Campaigns() {
     /**
      * Get CustomTreeStructures instance
      *
-     * @return CustomTreeStructures
+     * @return CustomTreeStructures instance
      * @deprecated Since 2.3.0, CustomTreeStructure is now only available as a screen object property.
      */
     @Deprecated
@@ -469,7 +540,7 @@ public CustomTreeStructures CustomTreeStructures() {
     /**
      * Get InternalSearches instance
      *
-     * @return InternalSearches
+     * @return InternalSearches instance
      * @deprecated Since 2.3.0, InternalSearch is now only available as a screen or gesture object property.
      */
     @Deprecated
@@ -480,125 +551,134 @@ public InternalSearches InternalSearches() {
     /**
      * Get Orders instance
      *
-     * @return Orders
+     * @return Orders instance
      */
     public Orders Orders() {
         return orders == null ? (orders = new Orders(this)) : orders;
     }
 
     /**
-     * Asynchronous method to set a new log
+     * Set a new log
      *
-     * @param log               String
-     * @param setConfigCallback SetConfigCallback
+     * @param log               ATInternet subdomain value
+     * @param setConfigCallback Callback called when the operation has been done
+     * @param sync              (optional) perform the operation synchronously (default: false)
      */
-    public void setLog(String log, SetConfigCallback setConfigCallback) {
+    public void setLog(String log, SetConfigCallback setConfigCallback, boolean... sync) {
         if (TextUtils.isEmpty(log)) {
-            Tool.executeCallback(listener, CallbackType.warning, "Bad value for log, default value retained");
+            Tool.executeCallback(listener, Tool.CallbackType.warning, "Bad value for log, default value retained");
         } else {
-            setConfig(TrackerConfigurationKeys.LOG, log, setConfigCallback);
+            setConfig(TrackerConfigurationKeys.LOG, log, setConfigCallback, sync);
         }
     }
 
     /**
-     * Asynchronous method to set a new secured log
+     * Set a new secured log
      *
-     * @param securedLog        String
-     * @param setConfigCallback SetConfigCallback
+     * @param securedLog        ATInternet secured subdomain value
+     * @param setConfigCallback Callback called when the operation has been done
+     * @param sync              (optional) perform the operation synchronously (default: false)
      */
-    public void setSecuredLog(String securedLog, SetConfigCallback setConfigCallback) {
+    public void setSecuredLog(String securedLog, SetConfigCallback setConfigCallback, boolean... sync) {
         if (TextUtils.isEmpty(securedLog)) {
-            Tool.executeCallback(listener, CallbackType.warning, "Bad value for secured log, default value retained");
+            Tool.executeCallback(listener, Tool.CallbackType.warning, "Bad value for secured log, default value retained");
         } else {
-            setConfig(TrackerConfigurationKeys.LOG_SSL, securedLog, setConfigCallback);
+            setConfig(TrackerConfigurationKeys.LOG_SSL, securedLog, setConfigCallback, sync);
         }
     }
 
     /**
-     * Asynchronous method to set a new domain
+     * Set a new domain
      *
-     * @param domain            String
-     * @param setConfigCallback SetConfigCallback
+     * @param domain            ATInternet collect domain value
+     * @param setConfigCallback Callback called when the operation has been done
+     * @param sync              (optional) perform the operation synchronously (default: false)
      */
-    public void setDomain(String domain, SetConfigCallback setConfigCallback) {
+    public void setDomain(String domain, SetConfigCallback setConfigCallback, boolean... sync) {
         if (TextUtils.isEmpty(domain)) {
-            Tool.executeCallback(listener, CallbackType.warning, "Bad value for domain, default value retained");
+            Tool.executeCallback(listener, Tool.CallbackType.warning, "Bad value for domain, default value retained");
         } else {
-            setConfig(TrackerConfigurationKeys.DOMAIN, domain, setConfigCallback);
+            setConfig(TrackerConfigurationKeys.DOMAIN, domain, setConfigCallback, sync);
         }
     }
 
     /**
-     * Asynchronous method to set a new siteId
+     * Set a new siteId
      *
-     * @param siteId            int
-     * @param setConfigCallback SetConfigCallback
+     * @param siteId            ATInternet site identifier
+     * @param setConfigCallback Callback called when the operation has been done
+     * @param sync              (optional) perform the operation synchronously (default: false)
      */
-    public void setSiteId(int siteId, SetConfigCallback setConfigCallback) {
+    public void setSiteId(int siteId, SetConfigCallback setConfigCallback, boolean... sync) {
         if (siteId <= 0) {
-            Tool.executeCallback(listener, CallbackType.warning, "Bad value for site id, default value retained");
+            Tool.executeCallback(listener, Tool.CallbackType.warning, "Bad value for site id, default value retained");
         } else {
-            setConfig(TrackerConfigurationKeys.SITE, siteId, setConfigCallback);
+            setConfig(TrackerConfigurationKeys.SITE, siteId, setConfigCallback, sync);
         }
     }
 
     /**
-     * Asynchronous method to set a new offline mode
+     * Set a new offline mode
      *
-     * @param offlineMode       OfflineMode
-     * @param setConfigCallback SetConfigCallback
+     * @param offlineMode       /
+     * @param setConfigCallback Callback called when the operation has been done
+     * @param sync              (optional) perform the operation synchronously (default: false)
      */
-    public void setOfflineMode(OfflineMode offlineMode, SetConfigCallback setConfigCallback) {
+    public void setOfflineMode(OfflineMode offlineMode, SetConfigCallback setConfigCallback, boolean... sync) {
         if (offlineMode == null) {
-            Tool.executeCallback(listener, CallbackType.warning, "Bad value for offline mode, default value retained");
+            Tool.executeCallback(listener, Tool.CallbackType.warning, "Bad value for offline mode, default value retained");
         } else {
-            setConfig(TrackerConfigurationKeys.OFFLINE_MODE, offlineMode.toString(), setConfigCallback);
+            setConfig(TrackerConfigurationKeys.OFFLINE_MODE, offlineMode.toString(), setConfigCallback, sync);
         }
     }
 
     /**
-     * Asynchronous method to enable secure mode
+     * Enable secure mode (use HTTPS with secured log)
      *
-     * @param enabled           boolean
-     * @param setConfigCallback SetConfigCallback
+     * @param enabled           /
+     * @param setConfigCallback Callback called when the operation has been done
+     * @param sync              (optional) perform the operation synchronously (default: false)
      */
-    public void setSecureModeEnabled(boolean enabled, SetConfigCallback setConfigCallback) {
-        setConfig(TrackerConfigurationKeys.SECURE, enabled, setConfigCallback);
+    public void setSecureModeEnabled(boolean enabled, SetConfigCallback setConfigCallback, boolean... sync) {
+        setConfig(TrackerConfigurationKeys.SECURE, enabled, setConfigCallback, sync);
     }
 
     /**
-     * Asynchronous method to set a new identifier type
+     * Set a new identifier type
      *
-     * @param identifierType    IdentifierType
-     * @param setConfigCallback SetConfigCallback
+     * @param identifierType    /
+     * @param setConfigCallback Callback called when the operation has been done
+     * @param sync              (optional) perform the operation synchronously (default: false)
      */
-    public void setIdentifierType(IdentifierType identifierType, SetConfigCallback setConfigCallback) {
+    public void setIdentifierType(IdentifierType identifierType, SetConfigCallback setConfigCallback, boolean... sync) {
         if (identifierType == null) {
-            Tool.executeCallback(listener, CallbackType.warning, "Bad value for identifier type, default value retained");
+            Tool.executeCallback(listener, Tool.CallbackType.warning, "Bad value for identifier type, default value retained");
         } else {
-            setConfig(TrackerConfigurationKeys.IDENTIFIER, identifierType.toString(), setConfigCallback);
+            setConfig(TrackerConfigurationKeys.IDENTIFIER, identifierType.toString(), setConfigCallback, sync);
         }
     }
 
     /**
-     * Asynchronous method to enable hash user id
+     * Enable hash user id (SHA-256 with salt to ensure anonymity)
      *
-     * @param enabled           boolean
-     * @param setConfigCallback SetConfigCallback
+     * @param enabled           /
+     * @param setConfigCallback Callback called when the operation has been done
+     * @param sync              (optional) perform the operation synchronously (default: false)
      */
-    public void setHashUserIdEnabled(boolean enabled, SetConfigCallback setConfigCallback) {
-        setConfig(TrackerConfigurationKeys.HASH_USER_ID, enabled, setConfigCallback);
+    public void setHashUserIdEnabled(boolean enabled, SetConfigCallback setConfigCallback, boolean... sync) {
+        setConfig(TrackerConfigurationKeys.HASH_USER_ID, enabled, setConfigCallback, sync);
     }
 
     /**
-     * Asynchronous method to set new plugins
+     * Set new plugins
      *
-     * @param plugins           List
-     * @param setConfigCallback SetConfigCallback
+     * @param plugins           /
+     * @param setConfigCallback Callback called when the operation has been done
+     * @param sync              (optional) perform the operation synchronously (default: false)
      */
-    public void setPlugins(List<PluginKey> plugins, SetConfigCallback setConfigCallback) {
+    public void setPlugins(List<PluginKey> plugins, SetConfigCallback setConfigCallback, boolean... sync) {
         if (plugins == null) {
-            setConfig(TrackerConfigurationKeys.PLUGINS, "", setConfigCallback);
+            setConfig(TrackerConfigurationKeys.PLUGINS, "", setConfigCallback, sync);
         } else {
             String value = "";
             boolean isFirst = true;
@@ -610,128 +690,137 @@ public void setPlugins(List<PluginKey> plugins, SetConfigCallback setConfigCallb
                 }
                 value += plugin.toString();
             }
-            setConfig(TrackerConfigurationKeys.PLUGINS, value, setConfigCallback);
+            setConfig(TrackerConfigurationKeys.PLUGINS, value, setConfigCallback, sync);
         }
     }
 
     /**
-     * Asynchronous method to set new plugins
+     * Set new pixel path
      *
-     * @param pixelPath         String
-     * @param setConfigCallback SetConfigCallback
+     * @param pixelPath         request path to get pixel
+     * @param setConfigCallback Callback called when the operation has been done
+     * @param sync              (optional) perform the operation synchronously (default: false)
      */
-    public void setPixelPath(String pixelPath, SetConfigCallback setConfigCallback) {
+    public void setPixelPath(String pixelPath, SetConfigCallback setConfigCallback, boolean... sync) {
         if (TextUtils.isEmpty(pixelPath)) {
-            Tool.executeCallback(listener, CallbackType.warning, "Bad value for pixel path, default value retained");
+            Tool.executeCallback(listener, Tool.CallbackType.warning, "Bad value for pixel path, default value retained");
         } else {
-            setConfig(TrackerConfigurationKeys.PIXEL_PATH, pixelPath, setConfigCallback);
+            setConfig(TrackerConfigurationKeys.PIXEL_PATH, pixelPath, setConfigCallback, sync);
         }
     }
 
     /**
-     * Asynchronous method to enable persistent identified visitor
+     * Enable persistent identified visitor (identification data available for all sessions)
      *
-     * @param enabled           boolean
-     * @param setConfigCallback SetConfigCallback
+     * @param enabled           /
+     * @param setConfigCallback Callback called when the operation has been done
+     * @param sync              (optional) perform the operation synchronously (default: false)
      */
-    public void setPersistentIdentifiedVisitorEnabled(boolean enabled, SetConfigCallback setConfigCallback) {
-        setConfig(TrackerConfigurationKeys.PERSIST_IDENTIFIED_VISITOR, enabled, setConfigCallback);
+    public void setPersistentIdentifiedVisitorEnabled(boolean enabled, SetConfigCallback setConfigCallback, boolean... sync) {
+        setConfig(TrackerConfigurationKeys.PERSIST_IDENTIFIED_VISITOR, enabled, setConfigCallback, sync);
     }
 
     /**
-     * Asynchronous method to set a new TVTracking url
+     * Set a new TVTracking url
      *
-     * @param url               String
-     * @param setConfigCallback SetConfigCallback
+     * @param url               TVTracking campaign url
+     * @param setConfigCallback Callback called when the operation has been done
+     * @param sync              (optional) perform the operation synchronously (default: false)
      */
-    public void setTvTrackingUrl(String url, SetConfigCallback setConfigCallback) {
+    public void setTvTrackingUrl(String url, SetConfigCallback setConfigCallback, boolean... sync) {
         if (TextUtils.isEmpty(url)) {
-            Tool.executeCallback(listener, CallbackType.warning, "Bad value for tv tracking url, default value retained");
+            Tool.executeCallback(listener, Tool.CallbackType.warning, "Bad value for tv tracking url, default value retained");
         } else {
-            setConfig(TrackerConfigurationKeys.TVTRACKING_URL, url, setConfigCallback);
+            setConfig(TrackerConfigurationKeys.TVTRACKING_URL, url, setConfigCallback, sync);
         }
     }
 
     /**
-     * Asynchronous method to set a new TVTracking visit duration
+     * Set a new TVTracking visit duration
      *
-     * @param visitDuration     int
-     * @param setConfigCallback SetConfigCallback
+     * @param visitDuration     duration of the visit
+     * @param setConfigCallback Callback called when the operation has been done
+     * @param sync              (optional) perform the operation synchronously (default: false)
      */
-    public void setTvTrackingVisitDuration(int visitDuration, SetConfigCallback setConfigCallback) {
+    public void setTvTrackingVisitDuration(int visitDuration, SetConfigCallback setConfigCallback, boolean... sync) {
         if (visitDuration <= 0) {
-            Tool.executeCallback(listener, CallbackType.warning, "Bad value for tv tracking visit duration, default value retained");
+            Tool.executeCallback(listener, Tool.CallbackType.warning, "Bad value for tv tracking visit duration, default value retained");
         } else {
-            setConfig(TrackerConfigurationKeys.TVTRACKING_VISIT_DURATION, visitDuration, setConfigCallback);
+            setConfig(TrackerConfigurationKeys.TVTRACKING_VISIT_DURATION, visitDuration, setConfigCallback, sync);
         }
     }
 
     /**
-     * Asynchronous method to set a new TVTracking spot validity time
+     * Set a new TVTracking spot validity time
      *
-     * @param time              int
-     * @param setConfigCallback SetConfigCallback
+     * @param time              time during which campaign is valid
+     * @param setConfigCallback Callback called when the operation has been done
+     * @param sync              (optional) perform the operation synchronously (default: false)
      */
-    public void setTvTrackingSpotValidityTime(int time, SetConfigCallback setConfigCallback) {
+    public void setTvTrackingSpotValidityTime(int time, SetConfigCallback setConfigCallback, boolean... sync) {
         if (time <= 0) {
-            Tool.executeCallback(listener, CallbackType.warning, "Bad value for tv tracking spot validity time, default value retained");
+            Tool.executeCallback(listener, Tool.CallbackType.warning, "Bad value for tv tracking spot validity time, default value retained");
         } else {
-            setConfig(TrackerConfigurationKeys.TVTRACKING_SPOT_VALIDITY_TIME, time, setConfigCallback);
+            setConfig(TrackerConfigurationKeys.TVTRACKING_SPOT_VALIDITY_TIME, time, setConfigCallback, sync);
         }
     }
 
     /**
-     * Asynchronous method to enable crash detection
+     * Enable crash detection
      *
-     * @param enabled           boolean
-     * @param setConfigCallback SetConfigCallback
+     * @param enabled           /
+     * @param setConfigCallback Callback called when the operation has been done
+     * @param sync              (optional) perform the operation synchronously (default: false)
      */
-    public void setCrashDetectionEnabled(boolean enabled, SetConfigCallback setConfigCallback) {
-        setConfig(TrackerConfigurationKeys.ENABLE_CRASH_DETECTION, enabled, setConfigCallback);
+    public void setCrashDetectionEnabled(boolean enabled, SetConfigCallback setConfigCallback, boolean... sync) {
+        setConfig(TrackerConfigurationKeys.ENABLE_CRASH_DETECTION, enabled, setConfigCallback, sync);
     }
 
     /**
-     * Asynchronous method to enable last persistence campaign
+     * Enable last persistence campaign
      *
-     * @param enabled           boolean
-     * @param setConfigCallback SetConfigCallback
+     * @param enabled           store last or first campaign
+     * @param setConfigCallback Callback called when the operation has been done
+     * @param sync              (optional) perform the operation synchronously (default: false)
      */
-    public void setCampaignLastPersistenceEnabled(boolean enabled, SetConfigCallback setConfigCallback) {
-        setConfig(TrackerConfigurationKeys.CAMPAIGN_LAST_PERSISTENCE, enabled, setConfigCallback);
+    public void setCampaignLastPersistenceEnabled(boolean enabled, SetConfigCallback setConfigCallback, boolean... sync) {
+        setConfig(TrackerConfigurationKeys.CAMPAIGN_LAST_PERSISTENCE, enabled, setConfigCallback, sync);
     }
 
     /**
-     * Asynchronous method to set a new campaign lifetime
+     * Set a new campaign lifetime
      *
-     * @param lifetime          int
-     * @param setConfigCallback SetConfigCallback
+     * @param lifetime          campaign lifetime
+     * @param setConfigCallback Callback called when the operation has been done
+     * @param sync              (optional) perform the operation synchronously (default: false)
      */
-    public void setCampaignLifetime(int lifetime, SetConfigCallback setConfigCallback) {
+    public void setCampaignLifetime(int lifetime, SetConfigCallback setConfigCallback, boolean... sync) {
         if (lifetime <= 0) {
-            Tool.executeCallback(listener, CallbackType.warning, "Bad value for campaign lifetime, default value retained");
+            Tool.executeCallback(listener, Tool.CallbackType.warning, "Bad value for campaign lifetime, default value retained");
         } else {
-            setConfig(TrackerConfigurationKeys.CAMPAIGN_LIFETIME, lifetime, setConfigCallback);
+            setConfig(TrackerConfigurationKeys.CAMPAIGN_LIFETIME, lifetime, setConfigCallback, sync);
         }
     }
 
     /**
-     * Asynchronous method to set a new session background duration
+     * Set a new session background duration
      *
-     * @param duration          int
-     * @param setConfigCallback SetConfigCallback
+     * @param duration          duration between two application openings after which a new session is started
+     * @param setConfigCallback Callback called when the operation has been done
+     * @param sync              (optional) perform the operation synchronously (default: false)
      */
-    public void setSessionBackgroundDuration(int duration, SetConfigCallback setConfigCallback) {
+    public void setSessionBackgroundDuration(int duration, SetConfigCallback setConfigCallback, boolean... sync) {
         if (duration <= 0) {
-            Tool.executeCallback(listener, CallbackType.warning, "Bad value for session background duration, default value retained");
+            Tool.executeCallback(listener, Tool.CallbackType.warning, "Bad value for session background duration, default value retained");
         } else {
-            setConfig(TrackerConfigurationKeys.SESSION_BACKGROUND_DURATION, duration, setConfigCallback);
+            setConfig(TrackerConfigurationKeys.SESSION_BACKGROUND_DURATION, duration, setConfigCallback, sync);
         }
     }
 
     /**
      * Create a default listener
      *
-     * @return TrackerListener
+     * @return tracker listener which log in console
      */
     public TrackerListener createDefaultTrackerListener() {
         return new TrackerListener() {
@@ -773,64 +862,103 @@ public void errorDidOccur(String message) {
     }
 
     /**
-     * Asynchronous method to set a new configuration
+     * Set a new configuration
      *
-     * @param conf              HashMap
-     * @param override          boolean
-     * @param setConfigCallback SetConfigCallback
+     * @param conf              map that contains new keys/values
+     * @param override          if true, old config fully cleared AND all default keys MUST be set
+     * @param setConfigCallback Callback called when the operation has been done
+     * @param sync              (optional) perform the operation synchronously (default: false)
+     * @deprecated Since 2.3.5, override boolean parameter is useless, {@link #setConfig(HashMap, SetConfigCallback, boolean...)} instead.
      */
-    public void setConfig(final HashMap<String, Object> conf, final boolean override, final SetConfigCallback setConfigCallback) {
-        TrackerQueue.getInstance().put(new Runnable() {
-            @Override
-            public void run() {
-                if (override) {
-                    configuration.clear();
+    @Deprecated
+    public void setConfig(final HashMap<String, Object> conf, final boolean override, final SetConfigCallback setConfigCallback, boolean... sync) {
+        if (sync.length == 1 && sync[0]) {
+            if (override) {
+                configuration.clear();
+            }
+            Set<String> keys = conf.keySet();
+            for (String key : keys) {
+                if (!Lists.getReadOnlyConfigs().contains(key)) {
+                    configuration.put(key, conf.get(key));
+                } else {
+                    Tool.executeCallback(listener, Tool.CallbackType.warning, "Cannot to overwrite " + key + " configuration");
                 }
-                Set<String> keys = conf.keySet();
-                for (String key : keys) {
-                    if (!Lists.getReadOnlyConfigs().contains(key)) {
-                        configuration.put(key, conf.get(key));
-                    } else {
-                        Tool.executeCallback(listener, CallbackType.warning, "Cannot to overwrite " + key + " configuration");
+            }
+            refreshConfigurationDependencies();
+        } else {
+            TrackerQueue.getInstance().put(new Runnable() {
+                @Override
+                public void run() {
+                    if (override) {
+                        configuration.clear();
+                    }
+                    Set<String> keys = conf.keySet();
+                    for (String key : keys) {
+                        if (!Lists.getReadOnlyConfigs().contains(key)) {
+                            configuration.put(key, conf.get(key));
+                        } else {
+                            Tool.executeCallback(listener, Tool.CallbackType.warning, "Cannot to overwrite " + key + " configuration");
+                        }
+                    }
+                    refreshConfigurationDependencies();
+                    if (setConfigCallback != null) {
+                        setConfigCallback.setConfigEnd();
                     }
                 }
-                refreshConfigurationDependencies();
-                if (setConfigCallback != null) {
-                    setConfigCallback.setConfigEnd();
-                }
-            }
-        });
+            });
+        }
     }
 
     /**
-     * Asynchronous method to change a configuration value for an existing key
+     * Set a new configuration
      *
-     * @param key               String
-     * @param value             Object
-     * @param setConfigCallback SetConfigCallback
+     * @param conf              map that contains new keys/values
+     * @param setConfigCallback Callback called when the operation has been done
+     * @param sync              (optional) perform the operation synchronously (default: false)
      */
-    public void setConfig(final String key, final Object value, final SetConfigCallback setConfigCallback) {
-        TrackerQueue.getInstance().put(new Runnable() {
-            @Override
-            public void run() {
-                if (!Lists.getReadOnlyConfigs().contains(key)) {
-                    configuration.put(key, value);
-                    refreshConfigurationDependencies();
-                    if (setConfigCallback != null) {
-                        setConfigCallback.setConfigEnd();
+    public void setConfig(final HashMap<String, Object> conf, final SetConfigCallback setConfigCallback, boolean... sync) {
+        setConfig(conf, false, setConfigCallback, sync);
+    }
+
+    /**
+     * Set an only one new key/value pair
+     *
+     * @param key               /
+     * @param value             /
+     * @param setConfigCallback Callback called when the operation has been done
+     * @param sync              (optional) perform the operation synchronously (default: false)
+     */
+    public void setConfig(final String key, final Object value, final SetConfigCallback setConfigCallback, boolean... sync) {
+        if (sync.length == 1 && sync[0]) {
+            if (!Lists.getReadOnlyConfigs().contains(key)) {
+                configuration.put(key, value);
+                refreshConfigurationDependencies();
+            } else {
+                Tool.executeCallback(listener, Tool.CallbackType.warning, "Cannot to overwrite " + key + " configuration");
+            }
+        } else {
+            TrackerQueue.getInstance().put(new Runnable() {
+                @Override
+                public void run() {
+                    if (!Lists.getReadOnlyConfigs().contains(key)) {
+                        configuration.put(key, value);
+                        refreshConfigurationDependencies();
+                        if (setConfigCallback != null) {
+                            setConfigCallback.setConfigEnd();
+                        }
+                    } else {
+                        Tool.executeCallback(listener, Tool.CallbackType.warning, "Cannot to overwrite " + key + " configuration");
                     }
-                } else {
-                    Tool.executeCallback(listener, CallbackType.warning, "Cannot to overwrite " + key + " configuration");
                 }
-            }
-        });
+            });
+        }
     }
 
     /**
      * Set a new listener
      *
-     * @param trackerListener TrackerListener
-     * @return Tracker
+     * @param trackerListener /
+     * @return Tracker instance
      */
     public Tracker setListener(TrackerListener trackerListener) {
         this.listener = trackerListener;
@@ -841,9 +969,9 @@ public Tracker setListener(TrackerListener trackerListener) {
     }
 
     /**
-     * Set a default tracker listener
+     * Set a default tracker listener (see createDefaultTrackerListener method)
      *
-     * @return Tracker
+     * @return Tracker instance
      */
     public Tracker setDefaultListener() {
         this.listener = createDefaultTrackerListener();
@@ -854,12 +982,30 @@ public Tracker setDefaultListener() {
     }
 
     /**
-     * Init with default configuration
+     * Initialisation with default configuration
+     */
+    public Tracker() {
+        try {
+            android.content.Context context = ((Application) Class.forName("android.app.ActivityThread")
+                    .getMethod("currentApplication").invoke(null, (Object[]) null));
+            appContext = new WeakReference<>(context);
+            configuration = new Configuration(appContext.get());
+            initTracker();
+            if (!LifeCycle.isInitialized) {
+                LifeCycle.initLifeCycle(appContext.get());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Initialisation with default configuration
      *
-     * @param context Context
+     * @param context the current Activity context
      */
     public Tracker(android.content.Context context) {
-        appContext = new WeakReference<>(context);
+        appContext = new WeakReference<>(context.getApplicationContext());
         configuration = new Configuration(appContext.get());
         initTracker();
         if (!LifeCycle.isInitialized) {
@@ -868,13 +1014,34 @@ public Tracker(android.content.Context context) {
     }
 
     /**
-     * Init with new configuration
+     * Initialisation with a custom configuration
+     *
+     * @param configuration map that contains new keys/values see TrackerConfigurationKeys
+     */
+    public Tracker(final HashMap<String, Object> configuration) {
+        android.content.Context context;
+        try {
+            context = ((Application) Class.forName("android.app.ActivityThread")
+                    .getMethod("currentApplication").invoke(null, (Object[]) null));
+            appContext = new WeakReference<>(context);
+            this.configuration = new Configuration(configuration);
+            initTracker();
+            if (!LifeCycle.isInitialized) {
+                LifeCycle.initLifeCycle(appContext.get());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Initialisation with a custom configuration
      *
-     * @param context       Context
-     * @param configuration HashMap
+     * @param context       the current Activity context
+     * @param configuration map that contains new keys/values see TrackerConfigurationKeys
      */
     public Tracker(android.content.Context context, final HashMap<String, Object> configuration) {
-        appContext = new WeakReference<>(context);
+        appContext = new WeakReference<>(context.getApplicationContext());
         this.configuration = new Configuration(configuration);
         initTracker();
         if (!LifeCycle.isInitialized) {
@@ -883,9 +1050,9 @@ public Tracker(android.content.Context context, final HashMap<String, Object> co
     }
 
     /**
-     * Enable or disable tracking
+     * Disable user identification
      *
-     * @param enabled boolean
+     * @param enabled /
      */
     public static void doNotTrack(final boolean enabled) {
         TrackerQueue.getInstance().put(new Runnable() {
@@ -897,9 +1064,9 @@ public void run() {
     }
 
     /**
-     * Tracking enabled or disabled
+     * Get "doNotTrack" value
      *
-     * @return boolean
+     * @return true if "doNotTrack" is enabled
      */
     public static boolean doNotTrackEnabled() {
         return TechnicalContext.doNotTrackEnabled(appContext.get());
@@ -908,217 +1075,207 @@ public static boolean doNotTrackEnabled() {
     /**
      * Add a parameter in the hit querystring
      *
-     * @param key   String
-     * @param value int
-     * @return Tracker
+     * @param key   parameter key
+     * @param value integer value
+     * @return Tracker instance
      */
     public Tracker setParam(String key, int value) {
-        return handleNotClosureStringParameterSetting(key, value, Type.Integer);
+        return handleNotClosureStringParameterSetting(key, value);
     }
 
     /**
      * Add a parameter in the hit querystring
      *
-     * @param key     String
-     * @param value   int
-     * @param options ParamOption
-     * @return Tracker
+     * @param key     parameter key
+     * @param value   integer value
+     * @param options parameter options
+     * @return Tracker instance
      */
     public Tracker setParam(String key, int value, ParamOption options) {
-        return handleNotClosureStringParameterSetting(key, value, Type.Integer, options);
+        return handleNotClosureStringParameterSetting(key, value, options);
     }
 
     /**
      * Add a parameter in the hit querystring
      *
-     * @param key   String
-     * @param value float
-     * @return Tracker
+     * @param key   parameter key
+     * @param value float value
+     * @return Tracker instance
      */
     public Tracker setParam(String key, float value) {
-        return handleNotClosureStringParameterSetting(key, value, Type.Float);
+        return handleNotClosureStringParameterSetting(key, value);
     }
 
     /**
      * Add a parameter in the hit querystring
      *
-     * @param key     String
-     * @param value   float
-     * @param options ParamOption
-     * @return Tracker
+     * @param key     parameter key
+     * @param value   float value
+     * @param options parameter options
+     * @return Tracker instance
      */
     public Tracker setParam(String key, float value, ParamOption options) {
-        return handleNotClosureStringParameterSetting(key, value, Type.Float, options);
+        return handleNotClosureStringParameterSetting(key, value, options);
     }
 
     /**
      * Add a parameter in the hit querystring
      *
-     * @param key   String
-     * @param value double
-     * @return Tracker
+     * @param key   parameter key
+     * @param value double value
+     * @return Tracker instance
      */
     public Tracker setParam(String key, double value) {
-        return handleNotClosureStringParameterSetting(key, value, Type.Double);
+        return handleNotClosureStringParameterSetting(key, value);
     }
 
     /**
      * Add a parameter in the hit querystring
      *
-     * @param key     String
-     * @param value   double
-     * @param options ParamOption
-     * @return Tracker
+     * @param key     parameter key
+     * @param value   double value
+     * @param options parameter options
+     * @return Tracker instance
      */
     public Tracker setParam(String key, double value, ParamOption options) {
-        return handleNotClosureStringParameterSetting(key, value, Type.Double, options);
+        return handleNotClosureStringParameterSetting(key, value, options);
     }
 
     /**
      * Add a parameter in the hit querystring
      *
-     * @param key   String
-     * @param value boolean
-     * @return Tracker
+     * @param key   parameter key
+     * @param value boolean value
+     * @return Tracker instance
      */
     public Tracker setParam(String key, boolean value) {
-        return handleNotClosureStringParameterSetting(key, value, Type.Boolean);
+        return handleNotClosureStringParameterSetting(key, value);
     }
 
     /**
      * Add a parameter in the hit querystring
      *
-     * @param key     String
-     * @param value   boolean
-     * @param options ParamOption
-     * @return Tracker
+     * @param key     parameter key
+     * @param value   boolean value
+     * @param options parameter options
+     * @return Tracker instance
      */
     public Tracker setParam(String key, boolean value, ParamOption options) {
-        return handleNotClosureStringParameterSetting(key, value, Type.Boolean, options);
+        return handleNotClosureStringParameterSetting(key, value, options);
     }
 
     /**
      * Add a parameter in the hit querystring
      *
-     * @param key   String
-     * @param value String
-     * @return Tracker
+     * @param key   parameter key
+     * @param value string value
+     * @return Tracker instance
      */
     public Tracker setParam(String key, String value) {
-        if (value != null && Tool.parseJSON(value) == null) {
-            return handleNotClosureStringParameterSetting(key, value, Type.String);
-        } else {
-            return handleNotClosureStringParameterSetting(key, value, Type.JSON);
-        }
+        return handleNotClosureStringParameterSetting(key, value);
     }
 
     /**
      * Add a parameter in the hit querystring
      *
-     * @param key     String
-     * @param value   String
-     * @param options ParamOption
-     * @return Tracker
+     * @param key     parameter key
+     * @param value   string value
+     * @param options parameter options
+     * @return Tracker instance
      */
     public Tracker setParam(String key, final String value, ParamOption options) {
-        if (value != null && Tool.parseJSON(value) == null) {
-            return handleNotClosureStringParameterSetting(key, value, Type.String, options);
-        } else {
-            return handleNotClosureStringParameterSetting(key, value, Type.JSON, options);
-        }
+        return handleNotClosureStringParameterSetting(key, value, options);
     }
 
     /**
      * Add a parameter in the hit querystring
      *
-     * @param key   String
-     * @param value List
-     * @return Tracker
+     * @param key   parameter key
+     * @param value list value
+     * @return Tracker instance
      */
     public Tracker setParam(String key, List value) {
-        return handleNotClosureStringParameterSetting(key, value, Type.Array);
+        return handleNotClosureStringParameterSetting(key, value);
     }
 
     /**
      * Add a parameter in the hit querystring
      *
-     * @param key     String
-     * @param value   List
-     * @param options ParamOption
-     * @return Tracker
+     * @param key     parameter key
+     * @param value   list value
+     * @param options parameter options
+     * @return Tracker instance
      */
     public Tracker setParam(String key, List value, ParamOption options) {
-        return handleNotClosureStringParameterSetting(key, value, Type.Array, options);
+        return handleNotClosureStringParameterSetting(key, value, options);
     }
 
     /**
      * Add a parameter in the hit querystring
      *
-     * @param key   String
-     * @param value Object[]
-     * @return Tracker
+     * @param key   parameter key
+     * @param value object array value
+     * @return Tracker instance
      */
     public Tracker setParam(String key, Object[] value) {
-        return handleNotClosureStringParameterSetting(key, value, Type.Array);
+        return handleNotClosureStringParameterSetting(key, value);
     }
 
     /**
      * Add a parameter in the hit querystring
      *
-     * @param key     String
-     * @param value   Object[]
-     * @param options ParamOption
-     * @return Tracker
+     * @param key     parameter key
+     * @param value   object array value
+     * @param options parameter options
+     * @return Tracker instance
      */
     public Tracker setParam(String key, Object[] value, ParamOption options) {
-        return handleNotClosureStringParameterSetting(key, value, Type.Array, options);
+        return handleNotClosureStringParameterSetting(key, value, options);
     }
 
     /**
      * Add a parameter in the hit querystring
      *
-     * @param key   String
-     * @param value Map
-     * @return Tracker
+     * @param key   parameter key
+     * @param value map value
+     * @return Tracker instance
      */
     public Tracker setParam(String key, Map value) {
-        return handleNotClosureStringParameterSetting(key, value, Type.JSON);
+        return handleNotClosureStringParameterSetting(key, value);
     }
 
     /**
      * Add a parameter in the hit querystring
      *
-     * @param key     String
-     * @param value   Map
-     * @param options ParamOption
-     * @return Tracker
+     * @param key     parameter key
+     * @param value   map value
+     * @param options parameter options
+     * @return Tracker instance
      */
     public Tracker setParam(String key, Map value, ParamOption options) {
-        return handleNotClosureStringParameterSetting(key, value, Type.JSON, options);
+        return handleNotClosureStringParameterSetting(key, value, options);
     }
 
     /**
      * Remove a parameter from the hit querystring
      *
-     * @param key String
+     * @param key parameter key to remove
      */
     public void unsetParam(String key) {
-        ArrayList<int[]> positions = Tool.findParameterPosition(key, buffer.getPersistentParams(), buffer.getVolatileParams());
+        buffer.getVolatileParams().remove(key);
+        buffer.getPersistentParams().remove(key);
+    }
 
-        // Check if parameter is already set in the buffer
-        if (positions.size() > 0) {
-            for (int[] indexTab : positions) {
-                if (indexTab[0] == 0) {
-                    buffer.getPersistentParams().remove(indexTab[1]);
-                } else {
-                    buffer.getVolatileParams().remove(indexTab[1]);
-                }
-            }
-        }
+    /**
+     * Reset Screen context to prevent bad link between screen and gesture
+     */
+    public void resetScreenContext() {
+        TechnicalContext.screenName = null;
+        TechnicalContext.level2 = 0;
     }
 
     /**
-     * Send the built hit
+     * Sends all tracking objects added
      */
     public void dispatch() {
         if (businessObjects.size() > 0) {
@@ -1224,226 +1381,4 @@ public void dispatch() {
             dispatcher.dispatch();
         }
     }
-
-    Buffer getBuffer() {
-        return buffer;
-    }
-
-    static Storage getStorage() {
-        return storage;
-    }
-
-    LinkedHashMap<String, BusinessObject> getBusinessObjects() {
-        return businessObjects;
-    }
-
-    Dispatcher getDispatcher() {
-        return dispatcher;
-    }
-
-    static android.content.Context getAppContext() {
-        return appContext.get();
-    }
-
-    static SharedPreferences getPreferences() {
-        return appContext.get().getSharedPreferences(TrackerConfigurationKeys.PREFERENCES, android.content.Context.MODE_PRIVATE);
-    }
-
-    String getInternalUserId() {
-        return internalUserId;
-    }
-
-    void setInternalUserId(String internalUserId) {
-        this.internalUserId = internalUserId;
-    }
-
-    @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH)
-    private void setTrackerActivityLifecycle() {
-        isTrackerActivityLifeCycleEnabled = true;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-            ((Application) appContext.get()).registerActivityLifecycleCallbacks(new TrackerActivityLifeCyle(configuration));
-        }
-    }
-
-    private void initTracker() {
-        try {
-            listener = null;
-            defaultCrashHandler = Thread.getDefaultUncaughtExceptionHandler();
-            storage = new Storage(appContext.get());
-            storage.setOfflineMode(Tool.convertStringToOfflineMode((String) configuration.get(TrackerConfigurationKeys.OFFLINE_MODE)));
-            buffer = new Buffer(this);
-            dispatcher = new Dispatcher(this);
-            if ((Boolean) configuration.get(TrackerConfigurationKeys.ENABLE_CRASH_DETECTION) && !(Thread.getDefaultUncaughtExceptionHandler() instanceof CrashDetectionHandler)) {
-                Thread.setDefaultUncaughtExceptionHandler(new CrashDetectionHandler(appContext.get(), defaultCrashHandler));
-            }
-            getPreferences().edit().putBoolean(TrackerConfigurationKeys.CAMPAIGN_ADDED_KEY, false).apply();
-
-            if (!isTrackerActivityLifeCycleEnabled) {
-                setTrackerActivityLifecycle();
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private Tracker setParam(String key, Closure value, Type type) {
-        // Check whether the parameter is not in read only mode
-        if (!Lists.getReadOnlyParams().contains(key)) {
-            Param p = new Param(key, value, type);
-            ArrayList<int[]> positions = Tool.findParameterPosition(key, buffer.getPersistentParams(), buffer.getVolatileParams());
-
-            // Check if parameter is already set
-            if (!positions.isEmpty()) {
-                // If found, change parameter value in appropriate buffer array
-                boolean isFirst = true;
-                for (int[] indexTab : positions) {
-                    int idArray = indexTab[0];
-                    int position = indexTab[1];
-                    if (isFirst) {
-                        if (idArray == 0) {
-                            buffer.getPersistentParams().set(position, p);
-                        } else {
-                            buffer.getVolatileParams().set(position, p);
-                        }
-                        isFirst = false;
-                    } else if (idArray == 0) {
-                        buffer.getPersistentParams().remove(position);
-                    } else {
-                        buffer.getVolatileParams().remove(position);
-                    }
-                }
-            } else {
-                // If not found, append parameter to volatile buffer
-                buffer.getVolatileParams().add(p);
-            }
-        } else {
-            Tool.executeCallback(listener, CallbackType.warning, String.format("Param %s is read only. Value will not be updated", key));
-        }
-
-        return this;
-    }
-
-    private Tracker setParam(String key, Closure value, Type type, ParamOption options) {
-        // Check whether the parameter is not in read only mode
-        if (!Lists.getReadOnlyParams().contains(key)) {
-            Param p = new Param(key, value, type, options);
-            ArrayList<int[]> positions = Tool.findParameterPosition(key, buffer.getPersistentParams(), buffer.getVolatileParams());
-
-            if (options.isAppend()) {
-                // Check if parameter is already set
-                for (int[] indexTab : positions) {
-                    int idArray = indexTab[0];
-                    int index = indexTab[1];
-                    // If new parameter is set to be persistent we move old parameters into the right buffer array
-                    if (options.isPersistent() && idArray == 1) {
-                        // If old parameter was in volatile buffer, we place it into the persistent buffer
-                        Param existingParam = buffer.getVolatileParams().remove(index);
-                        buffer.getPersistentParams().add(existingParam);
-                    } else if (idArray == 0) {
-                        Param existingParam = buffer.getPersistentParams().remove(index);
-                        buffer.getVolatileParams().add(existingParam);
-                    }
-                }
-                if (options.isPersistent()) {
-                    buffer.getPersistentParams().add(p);
-                } else {
-                    buffer.getVolatileParams().add(p);
-                }
-            } else {
-                // Check if parameter is already set
-                if (!positions.isEmpty()) {
-                    boolean isFirst = true;
-                    // If found, replace first parameter with new value and delete others in appropriate buffer array
-                    for (int[] indexTab : positions) {
-                        int idArray = indexTab[0];
-                        int index = indexTab[1];
-                        if (isFirst) {
-                            if (idArray == 0) {
-                                if (options.isPersistent()) {
-                                    buffer.getPersistentParams().set(index, p);
-                                } else {
-                                    buffer.getPersistentParams().remove(index);
-                                    buffer.getVolatileParams().add(p);
-                                }
-                            } else {
-                                if (options.isPersistent()) {
-                                    buffer.getVolatileParams().remove(index);
-                                    buffer.getPersistentParams().add(p);
-                                } else {
-                                    buffer.getVolatileParams().set(index, p);
-                                }
-                            }
-                            isFirst = false;
-                        } else if (idArray == 0) {
-                            buffer.getPersistentParams().remove(index);
-                        } else {
-                            buffer.getVolatileParams().remove(index);
-                        }
-                    }
-                } else if (options.isPersistent()) {
-                    buffer.getPersistentParams().add(p);
-                } else {
-                    buffer.getVolatileParams().add(p);
-                }
-            }
-        } else {
-            Tool.executeCallback(listener, CallbackType.warning, String.format("Param %s is read only. Value will not be updated", key));
-        }
-
-        return this;
-    }
-
-    Tracker setParam(String key, Closure value) {
-        return setParam(key, value, Type.Closure);
-    }
-
-    Tracker setParam(String key, Closure value, ParamOption options) {
-        return setParam(key, value, Type.Closure, options);
-    }
-
-    private void refreshConfigurationDependencies() {
-        String identifierKey = String.valueOf(configuration.get(TrackerConfigurationKeys.IDENTIFIER));
-        String offlineMode = String.valueOf(configuration.get(TrackerConfigurationKeys.OFFLINE_MODE));
-        boolean enableCrashDetectionHandler = Boolean.parseBoolean(String.valueOf(configuration.get(TrackerConfigurationKeys.ENABLE_CRASH_DETECTION)));
-
-        if (!TextUtils.isEmpty(identifierKey)) {
-            buffer.setIdentifierKey(identifierKey);
-        }
-        if (!TextUtils.isEmpty(offlineMode)) {
-            storage.setOfflineMode(Tool.convertStringToOfflineMode(offlineMode));
-        }
-
-        if (enableCrashDetectionHandler) {
-            if (!(Thread.getDefaultUncaughtExceptionHandler() instanceof CrashDetectionHandler)) {
-                Thread.setDefaultUncaughtExceptionHandler(new CrashDetectionHandler(appContext.get(), defaultCrashHandler));
-            }
-        } else {
-            if (Thread.getDefaultUncaughtExceptionHandler() instanceof CrashDetectionHandler) {
-                Thread.setDefaultUncaughtExceptionHandler(defaultCrashHandler);
-            }
-        }
-    }
-
-    private Tracker handleNotClosureStringParameterSetting(String key, final Object value, Type type, final ParamOption... options) {
-        Closure stringValue = new Closure() {
-            @Override
-            public String execute() {
-                return Tool.convertToString(value, options.length > 0 ? options[0].getSeparator() : ",");
-            }
-        };
-        if (options.length > 0) {
-            return setParam(key, stringValue, type, options[0]);
-        } else {
-            return setParam(key, stringValue, type);
-        }
-    }
-
-    private void dispatchObjects(ArrayList<BusinessObject> objects, ArrayList<BusinessObject> customObjects) {
-        if (!objects.isEmpty()) {
-            objects.addAll(customObjects);
-            dispatcher.dispatch((BusinessObject[]) objects.toArray(new BusinessObject[objects.size()]));
-            customObjects.clear();
-            objects.clear();
-        }
-    }
 }
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/TrackerActivityLifeCyle.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/TrackerActivityLifeCyle.java
deleted file mode 100644
index e5587453..00000000
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/TrackerActivityLifeCyle.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-This SDK is licensed under the MIT license (MIT)
-Copyright (c) 2015- Applied Technologies Internet SAS (registration number B 403 261 258 - Trade and Companies Register of Bordeaux – France)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
- */
-package com.atinternet.tracker;
-
-import android.annotation.TargetApi;
-import android.app.Activity;
-import android.app.Application;
-import android.os.Bundle;
-
-@TargetApi(android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH)
-class TrackerActivityLifeCyle implements Application.ActivityLifecycleCallbacks {
-
-    private static final int DELTA = 2;
-
-    private long timeInBackground;
-    private final Configuration configuration;
-    private String savedActivityName;
-    private int savedActivityTaskId;
-
-    TrackerActivityLifeCyle(Configuration configuration) {
-        timeInBackground = -1;
-        this.configuration = configuration;
-        savedActivityName = null;
-    }
-
-    @Override
-    public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
-        if (savedActivityName == null || activity == null || !activity.getClass().getCanonicalName().equals(savedActivityName)
-                || activity.getTaskId() == savedActivityTaskId) {
-            timeInBackground = -1;
-        }
-    }
-
-    @Override
-    public void onActivityStarted(Activity activity) {
-        if (timeInBackground > -1) {
-            int sessionBackgroundDuration = Integer.parseInt(String.valueOf(configuration.get(TrackerConfigurationKeys.SESSION_BACKGROUND_DURATION)));
-            if (Tool.getSecondsBetweenTimes(System.currentTimeMillis(), timeInBackground) >= (sessionBackgroundDuration < DELTA ? DELTA : sessionBackgroundDuration)) {
-                LifeCycle.newSessionInit(Tracker.getPreferences());
-                timeInBackground = -1;
-            }
-        }
-    }
-
-    @Override
-    public void onActivityResumed(Activity activity) {
-        // Required by interface
-    }
-
-    @Override
-    public void onActivityPaused(Activity activity) {
-        savedActivityName = activity.getClass().getCanonicalName();
-        savedActivityTaskId = activity.getTaskId();
-        timeInBackground = System.currentTimeMillis();
-    }
-
-    @Override
-    public void onActivityStopped(Activity activity) {
-        // Required by interface
-    }
-
-    @Override
-    public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
-        // Required by interface
-    }
-
-    @Override
-    public void onActivityDestroyed(Activity activity) {
-        // Required by interface
-    }
-}
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/TrackerConfigurationKeys.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/TrackerConfigurationKeys.java
index 47df6ff5..9e816f10 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/TrackerConfigurationKeys.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/TrackerConfigurationKeys.java
@@ -22,14 +22,11 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
+/**
+ * Tracker Configuration Keys constants
+ */
 public class TrackerConfigurationKeys {
 
-    /**
-     * *******************
-     * /* Shared Preferences
-     * ********************
-     */
-
     // Key representing the namespace used for preferences
     static final String PREFERENCES = "ATPreferencesKey";
 
@@ -69,9 +66,6 @@ public class TrackerConfigurationKeys {
     //Global key representing idclient from uuid
     static final String IDCLIENT_UUID = "ATIdclientUUID";
 
-    /*****************
-     * Configuration
-     ****************/
     /**
      * Constant for storage offline mode configuration key
      */
@@ -83,7 +77,7 @@ public class TrackerConfigurationKeys {
     public static final String IDENTIFIER = "identifier";
 
     /**
-     * Constant for hashuserid configuration
+     * Constant for hash use rid configuration
      */
     public static final String HASH_USER_ID = "hashUserId";
 
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/TrackerKeys.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/TrackerKeys.java
deleted file mode 100644
index 5856b9dc..00000000
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/TrackerKeys.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
-This SDK is licensed under the MIT license (MIT)
-Copyright (c) 2015- Applied Technologies Internet SAS (registration number B 403 261 258 - Trade and Companies Register of Bordeaux – France)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
- */
-package com.atinternet.tracker;
-
-public class TrackerKeys {
-
-    /**
-     * *******************
-     * /* Shared Preferences
-     * ********************
-     */
-
-    // Key representing the namespace used for preferences
-    static final String PREFERENCES = "ATPreferencesKey";
-
-    //Global key representing if is install hit sent
-    static final String IS_FIRST_AFTER_INSTALL_HIT_KEY = "ATIsFirstAfterInstallHit";
-
-    //Global key representing if is first hit sent
-    static final String IS_FIRST_SCREEN_HIT_KEY = "ATIsFirstScreenHit";
-
-    //Global key representing if is first hit sent
-    static final String CAMPAIGN_ADDED_KEY = "ATCampaignAdded";
-
-    //Global key representing if user wants tracked or not
-    static final String DO_NOT_TRACK_ENABLED = "ATDoNotTrackEnabled";
-
-    //Global key representing campaign marketing saved
-    static final String MARKETING_CAMPAIGN_SAVED = "ATMarketingCampaignSaved";
-
-    //Global key representing campaign marketing date saved
-    static final String LAST_MARKETING_CAMPAIGN_TIME = "ATLastMarketingCampaignTime";
-
-    //Global key representing date of last hit sent
-    static final String LAST_TVT_EXECUTE_TIME = "ATLastTVTExecuteTime";
-
-    //Global key representing date of last hit sent
-    static final String REFERRER = "ATReferrer";
-
-    //Global key representing current tvtracking campaign
-    static final String DIRECT_CAMPAIGN_SAVED = "ATDirectCampaignSaved";
-
-    //Global key representing remanent tvtracking campaign
-    static final String REMANENT_CAMPAIGN_SAVED = "ATRemanentCampaignSaved";
-
-    //Global key representing remanent campaign saved time
-    static final String REMANENT_CAMPAIGN_TIME_SAVED = "ATRemanentCampaignTimeSaved";
-
-    //Global key representing info tvtracking campaign
-    static final String INFO_CAMPAIGN_SAVED = "ATInfoCampaignSaved";
-
-    /*****************
-     * Configuration
-     ****************/
-    /**
-     * Constant for storage offline mode configuration key
-     */
-    public static final String STORAGE = "storage";
-
-    /**
-     * Constant for identifier configuration
-     */
-    public static final String IDENTIFIER = "identifier";
-
-    /**
-     * Constant for hashuserid configuration
-     */
-    public static final String HASH_USER_ID = "hashUserId";
-
-    /**
-     * Constant for enableCrashDetection configuration
-     */
-    public static final String ENABLE_CRASH_DETECTION = "enableCrashDetection";
-
-    /**
-     * Constant for secure configuration
-     */
-    public static final String SECURE = "secure";
-
-    /**
-     * Constant for log configuration
-     */
-    public static final String LOG = "log";
-
-    /**
-     * Constant for log secure configuration
-     */
-    public static final String LOG_SSL = "logSSL";
-
-    /**
-     * Constant for site configuration
-     */
-    public static final String SITE = "site";
-
-    /**
-     * Constant for pixel path configuration
-     */
-    public static final String PIXEL_PATH = "pixelPath";
-
-    /**
-     * Constant for domain configuration
-     */
-    public static final String DOMAIN = "domain";
-
-    /**
-     * Constant for persist identified visitor configuration
-     */
-    public static final String PERSIST_IDENTIFIED_VISITOR = "persistIdentifiedVisitor";
-
-    /**
-     * Constant for plugins configuration
-     */
-    public static final String PLUGINS = "plugins";
-
-    /**
-     * Constant for tvt url configuration
-     */
-    public static final String TVT_URL = "tvtURL";
-
-    /**
-     * Constant for tvt visit duration configuration
-     */
-    public static final String TVT_VISIT_DURATION = "tvtVisitDuration";
-
-    /**
-     * Constant for tvt spot validity time configuration
-     */
-    public static final String TVT_SPOT_VALIDITY_TIME = "tvtSpotValidityTime";
-
-    /**
-     * Constant for campaign remanence configuration
-     */
-    public static final String CAMPAIGN_LAST_PERSISTENCE = "campaignLastPersistence";
-
-    /**
-     * Constant for lifetime marketing campaign
-     */
-    public static final String CAMPAIGN_LIFETIME = "campaignLifetime";
-
-    /**
-     * Constant for download SDK source
-     */
-    static final String DOWNLOAD_SOURCE = "downloadSource";
-
-    /**
-     * Constant for session duration
-     */
-    static final String SESSION_BACKGROUND_DURATION = "sessionBackgroundDuration";
-}
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/TrackerListener.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/TrackerListener.java
index 1da6636e..ddef6256 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/TrackerListener.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/TrackerListener.java
@@ -22,64 +22,74 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
+/**
+ * Send different events during hit building
+ */
 public interface TrackerListener {
 
     /**
-     * Enum for Tracker callbacks
+     * Status enum
      */
     enum HitStatus {
-        Failed, Success
+        /**
+         * Failed status
+         */
+        Failed,
+        /**
+         * Success status
+         */
+        Success
     }
 
     /**
-     * First launched approbation callback
+     * Notify when tracker needs first launched approval
      *
-     * @param message String
+     * @param message String: approval message for confidentiality
      */
     void trackerNeedsFirstLaunchApproval(String message);
 
     /**
-     * End hit construction callback
+     * Notify when hit has been built
      *
-     * @param status  HitStatus
-     * @param message String
+     * @param status  HitStatus: status of hit building
+     * @param message String: query string or error message
      */
     void buildDidEnd(HitStatus status, String message);
 
     /**
-     * End sending hit callback
+     * Notify when hit has been sent
      *
-     * @param status  HitStatus
-     * @param message String
+     * @param status  HitStatus: status of hit sending
+     * @param message String: query string or http response message
      */
     void sendDidEnd(HitStatus status, String message);
 
     /**
-     * Call partner callback
+     * Notify when a partner has been called
      *
-     * @param response String
+     * @param response String: the partner response
      */
     void didCallPartner(String response);
 
     /**
-     * Warning callback
+     * Notify when a warning has been detected
      *
-     * @param message String
+     * @param message String: the warning message
      */
     void warningDidOccur(String message);
 
 
     /**
-     * Save did end callback
+     * Notify when hit has been saved in device local storage
      *
-     * @param message String
+     * @param message String: the saved hit
      */
     void saveDidEnd(String message);
 
     /**
-     * Error callback
+     * Notify when a critical error has been detected
      *
-     * @param message String
+     * @param message String: the error message
      */
     void errorDidOccur(String message);
 }
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/TrackerQueue.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/TrackerQueue.java
deleted file mode 100644
index d5696268..00000000
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/TrackerQueue.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
-This SDK is licensed under the MIT license (MIT)
-Copyright (c) 2015- Applied Technologies Internet SAS (registration number B 403 261 258 - Trade and Companies Register of Bordeaux – France)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
- */
-package com.atinternet.tracker;
-
-import java.util.concurrent.Executors;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ScheduledExecutorService;
-
-/**
- * Store the hits to build
- */
-class TrackerQueue extends LinkedBlockingQueue<Runnable> {
-
-    /**
-     * Boolean to know if the database content is present in queue
-     */
-    private static boolean ENABLED_FILL_QUEUE_FROM_DATABASE = true;
-
-    /**
-     * Builder queue instance
-     */
-    private static TrackerQueue instance;
-
-    /**
-     * Executor services for run tasks in the queue
-     */
-    private final ScheduledExecutorService scheduledExecutorService;
-
-    /**
-     * Set enabled fill queue from database
-     *
-     * @param enabled boolean
-     */
-    static void setEnabledFillQueueFromDatabase(boolean enabled) {
-        ENABLED_FILL_QUEUE_FROM_DATABASE = enabled;
-    }
-
-    /**
-     * Get enabled fill queue from database
-     *
-     * @return boolean
-     */
-    static boolean getEnabledFillQueueFromDatabase() {
-        return ENABLED_FILL_QUEUE_FROM_DATABASE;
-    }
-
-    /**
-     * Init the builderQueue
-     */
-    private TrackerQueue() {
-        scheduledExecutorService = Executors.newSingleThreadScheduledExecutor();
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    Runnable runnable;
-                    while ((runnable = take()) != null) {
-                        scheduledExecutorService.execute(runnable);
-                    }
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }).start();
-    }
-
-    /**
-     * Get instance of the builder queue singleton
-     *
-     * @return BuilderQueue
-     */
-    static TrackerQueue getInstance() {
-        return instance == null ? (instance = new TrackerQueue()) : instance;
-    }
-
-    /**
-     * Put a new task and run it
-     *
-     * @param runnable Runnable
-     */
-    @Override
-    public void put(Runnable runnable) {
-        try {
-            if (runnable != null) {
-                super.put(runnable);
-            }
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-    }
-}
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/UserIdCallback.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/UserIdCallback.java
index d4aac440..f054c916 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/UserIdCallback.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/UserIdCallback.java
@@ -22,11 +22,14 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
+/**
+ * UserIdCallback should be implemented when getUserId method in async mode called
+ */
 public interface UserIdCallback {
     /**
-     * Callback called when getUserId is used
+     * Called when user id has been get
      *
-     * @param id String
+     * @param id String: the user id
      */
     void receiveUserId(String id);
 }
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Video.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Video.java
index 711f0e01..3baaa92e 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Video.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Video.java
@@ -22,14 +22,23 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
+/**
+ * Wrapper class for video media tracking
+ */
 public class Video extends RichMedia {
 
     private int duration;
 
+    Video(MediaPlayer player) {
+        super(player);
+        broadcastMode = BroadcastMode.Clip;
+        type = "video";
+    }
+
     /**
      * Get duration
      *
-     * @return int
+     * @return the duration
      */
     public int getDuration() {
         return duration;
@@ -38,8 +47,8 @@ public int getDuration() {
     /**
      * Set a new duration
      *
-     * @param duration int
-     * @return Video
+     * @param duration /
+     * @return Video instance
      */
     public Video setDuration(int duration) {
         this.duration = duration;
@@ -50,8 +59,8 @@ public Video setDuration(int duration) {
     /**
      * Set an new name
      *
-     * @param name String
-     * @return Video
+     * @param name /
+     * @return Video instance
      */
     public Video setName(String name) {
         this.name = name;
@@ -61,8 +70,8 @@ public Video setName(String name) {
     /**
      * Set a new level 2
      *
-     * @param level2 int
-     * @return Video
+     * @param level2 /
+     * @return Video instance
      */
     public Video setLevel2(int level2) {
         this.level2 = level2;
@@ -71,10 +80,10 @@ public Video setLevel2(int level2) {
     }
 
     /**
-     * Change boolean isBuffering value
+     * Change boolean "isBuffering" value
      *
-     * @param isBuffering boolean
-     * @return Video
+     * @param isBuffering /
+     * @return Video instance
      */
     public Video setBuffering(boolean isBuffering) {
         this.isBuffering = isBuffering;
@@ -83,10 +92,10 @@ public Video setBuffering(boolean isBuffering) {
     }
 
     /**
-     * Change boolean isEmbedded value
+     * Change boolean "isEmbedded" value
      *
-     * @param isEmbedded boolean
-     * @return Video
+     * @param isEmbedded /
+     * @return Video instance
      */
     public Video setEmbedded(boolean isEmbedded) {
         this.isEmbedded = isEmbedded;
@@ -97,8 +106,8 @@ public Video setEmbedded(boolean isEmbedded) {
     /**
      * Set a new first chapter
      *
-     * @param chapter1 String
-     * @return Video
+     * @param chapter1 /
+     * @return Video instance
      */
     public Video setChapter1(String chapter1) {
         this.chapter1 = chapter1;
@@ -108,8 +117,8 @@ public Video setChapter1(String chapter1) {
     /**
      * Set a new second chapter
      *
-     * @param chapter2 String
-     * @return Video
+     * @param chapter2 /
+     * @return Video instance
      */
     public Video setChapter2(String chapter2) {
         this.chapter2 = chapter2;
@@ -119,8 +128,8 @@ public Video setChapter2(String chapter2) {
     /**
      * Set a new third chapter
      *
-     * @param chapter3 String
-     * @return Video
+     * @param chapter3 /
+     * @return Video instance
      */
     public Video setChapter3(String chapter3) {
         this.chapter3 = chapter3;
@@ -130,8 +139,8 @@ public Video setChapter3(String chapter3) {
     /**
      * Set a new action
      *
-     * @param action RichMedia.Action
-     * @return Video
+     * @param action /
+     * @return Video instance
      */
     public Video setAction(Action action) {
         this.action = action;
@@ -142,20 +151,14 @@ public Video setAction(Action action) {
     /**
      * Set a new webdomain
      *
-     * @param webDomain String
-     * @return Video
+     * @param webDomain /
+     * @return Video instance
      */
     public Video setWebDomain(String webDomain) {
         this.webDomain = webDomain;
         return this;
     }
 
-    Video(MediaPlayer player) {
-        super(player);
-        broadcastMode = BroadcastMode.Clip;
-        type = "video";
-    }
-
     @Override
     void setEvent() {
         super.setEvent();
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Videos.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Videos.java
index 836695f2..c536359a 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Videos.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Videos.java
@@ -24,6 +24,9 @@ of this software and associated documentation files (the "Software"), to deal
 
 import java.util.ArrayList;
 
+/**
+ * Wrapper class to manage Video instances
+ */
 public class Videos {
 
     final ArrayList<Video> list = new ArrayList<>();
@@ -34,11 +37,11 @@ public class Videos {
     }
 
     /**
-     * Create new video
+     * Add a new video
      *
-     * @param name     String
-     * @param duration int
-     * @return Video
+     * @param name     video name
+     * @param duration video duration
+     * @return Video instance
      */
     public Video add(String name, int duration) {
         int index = -1;
@@ -65,39 +68,39 @@ public Video add(String name, int duration) {
     }
 
     /**
-     * Create new video
+     * Add a new video
      *
-     * @param name     String
-     * @param chapter1 String
-     * @param duration int
-     * @return Video
+     * @param name     video name
+     * @param chapter1 video first chapter
+     * @param duration video duration
+     * @return Video instance
      */
     public Video add(String name, String chapter1, int duration) {
         return add(name, duration).setChapter1(chapter1);
     }
 
     /**
-     * Create new video
+     * Add a new video
      *
-     * @param name     String
-     * @param chapter1 String
-     * @param chapter2 String
-     * @param duration int
-     * @return Video
+     * @param name     video name
+     * @param chapter1 video first chapter
+     * @param chapter2 video second chapter
+     * @param duration video duration
+     * @return Video instance
      */
     public Video add(String name, String chapter1, String chapter2, int duration) {
         return add(name, chapter1, duration).setChapter2(chapter2);
     }
 
     /**
-     * Create new video
+     * Add a new video
      *
-     * @param name     String
-     * @param chapter1 String
-     * @param chapter2 String
-     * @param chapter3 String
-     * @param duration int
-     * @return Video
+     * @param name     video name
+     * @param chapter1 video first chapter
+     * @param chapter2 video second chapter
+     * @param chapter3 video third chapter
+     * @param duration video duration
+     * @return Video instance
      */
     public Video add(String name, String chapter1, String chapter2, String chapter3, int duration) {
         return add(name, chapter1, chapter2, duration).setChapter3(chapter3);
@@ -106,7 +109,7 @@ public Video add(String name, String chapter1, String chapter2, String chapter3,
     /**
      * Remove a video
      *
-     * @param name String
+     * @param name video identified by name
      */
     public void remove(String name) {
         int length = list.size();
diff --git a/ATMobileAnalytics/Tracker/src/main/res/layout/debugger_bubble_layout.xml b/ATMobileAnalytics/Tracker/src/main/res/layout/debugger_bubble_layout.xml
deleted file mode 100644
index 178c404c..00000000
--- a/ATMobileAnalytics/Tracker/src/main/res/layout/debugger_bubble_layout.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <ImageView
-        android:id="@+id/debugBubble"
-        android:contentDescription="@string/empty"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/ATMobileAnalytics/Tracker/src/main/res/layout/debugger_layout.xml b/ATMobileAnalytics/Tracker/src/main/res/layout/debugger_layout.xml
index a52bc406..32e00f99 100644
--- a/ATMobileAnalytics/Tracker/src/main/res/layout/debugger_layout.xml
+++ b/ATMobileAnalytics/Tracker/src/main/res/layout/debugger_layout.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.atinternet.tracker.ATFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:layout_margin="10dp"
-    android:visibility="gone"
     android:background="@drawable/layout_background"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:visibility="gone">
 
     <include layout="@layout/event_viewer_layout" />
 
     <include layout="@layout/offline_hits_viewer_layout" />
 
     <include layout="@layout/hit_detail_viewer_layout" />
-</FrameLayout>
+</com.atinternet.tracker.ATFrameLayout>
diff --git a/ATMobileAnalytics/Tracker/src/main/res/values/color.xml b/ATMobileAnalytics/Tracker/src/main/res/values/color.xml
index 422881be..3f7a4087 100644
--- a/ATMobileAnalytics/Tracker/src/main/res/values/color.xml
+++ b/ATMobileAnalytics/Tracker/src/main/res/values/color.xml
@@ -3,4 +3,9 @@
     <color name="at_blue">#072750</color>
     <color name="at_grey">#D3D7DC</color>
     <color name="at_darker_grey">#D6D6D6</color>
+    <color name="at_toolbar_background">#072237</color>
+
+    <color name="at_popup_text">#072237</color>
+    <color name="at_popup_button_text">#0CACF8</color>
+    <color name="at_popup_background">#FAFAFA</color>
 </resources>
\ No newline at end of file
diff --git a/ATMobileAnalytics/Tracker/src/main/res/values/strings.xml b/ATMobileAnalytics/Tracker/src/main/res/values/strings.xml
index b49900bf..09044c51 100644
--- a/ATMobileAnalytics/Tracker/src/main/res/values/strings.xml
+++ b/ATMobileAnalytics/Tracker/src/main/res/values/strings.xml
@@ -8,4 +8,20 @@
     <string name="no_offline_hits">No stored hits</string>
     <string name="empty" />
 
+    <string name="disconnected">Disconnected</string>
+    <string name="connecting">Connecting &#8230;</string>
+    <string name="connected">Connected</string>
+    <string name="initial_time">00 : 00 : 00</string>
+    <string name="pairing_request_title">Pairing request</string>
+    <string name="pairing_request_message">Do you want to start live tagging session ?</string>
+    <string name="pairing_refuse_button">Refuse</string>
+    <string name="ok">OK</string>
+
+    <string name="pairing_canceled_title">Disconnection</string>
+    <string name="pairing_canceled_message">Pairing request has been canceled</string>
+    <string name="pairing_stopped_title">Live session ended</string>
+    <string name="pairing_stopped_message">UI has disconnected</string>
+    <string name="pairing_refused_title">Information</string>
+    <string name="pairing_refused_message">UI has refused the pairing request</string>
+
 </resources>
\ No newline at end of file
diff --git a/ATMobileAnalytics/Tracker/src/main/res/values/values.xml b/ATMobileAnalytics/Tracker/src/main/res/values/values.xml
deleted file mode 100644
index a6a32ad9..00000000
--- a/ATMobileAnalytics/Tracker/src/main/res/values/values.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
-    <declare-styleable name="LoadingImageView">
-        <attr name="imageAspectRatioAdjust" format="enum">
-            <enum name="none" value="0" />
-            <enum name="adjust_width" value="1" />
-            <enum name="adjust_height" value="2" />
-        </attr>
-        <attr name="imageAspectRatio" format="float" />
-        <attr name="circleCrop" format="boolean" />
-    </declare-styleable>
-    <eat-comment />
-    <integer name="google_play_services_version">9452000</integer>
-    <eat-comment />
-    <string name="common_google_play_services_unknown_issue"><ns1:g id="app_name">%1$s</ns1:g> is having trouble with Google Play services. If the problem persists, please contact the developer for assistance.</string>
-    <declare-styleable name="AdsAttrs">
-        <attr name="adSize" format="string" />
-        <attr name="adSizes" format="string" />
-        <attr name="adUnitId" format="string" />
-    </declare-styleable>
-    <eat-comment />
-
-    <style name="Theme.IAPTheme" parent="android:Theme">
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:backgroundDimEnabled">false</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/HitTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ATInternetTest.java
similarity index 62%
rename from ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/HitTest.java
rename to ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ATInternetTest.java
index 0cc064a8..89e22a0c 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/HitTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ATInternetTest.java
@@ -22,55 +22,33 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-import java.util.Date;
-
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
-public class HitTest extends AbstractTestClass {
-
-    private Hit hit;
-
-    @Before
-    public void setUp() throws Exception {
-        super.setUp();
-        hit = new Hit("hit", new Date(), 0, false);
-    }
-
-    @Test
-    public void multiInstanceTest() {
-        Hit hit1 = new Hit("hit2", new Date(), 1, false);
-        assertNotSame(hit, hit1);
-    }
-
-    @Test
-    public void getDateTest() {
-        assertNotNull(hit.getDate());
-        assertNotSame(new Date(), hit.getDate());
-    }
+public class ATInternetTest {
 
     @Test
-    public void getUrlTest() {
-        assertEquals("hit", hit.getUrl());
+    public void getInstanceTest() {
+        ATInternet atInternet = ATInternet.getInstance();
+        assertEquals(atInternet, ATInternet.getInstance());
     }
 
     @Test
-    public void getRetryTest() {
-        assertEquals(0, hit.getRetry());
+    public void getDefaultTracker() {
+        Tracker t = ATInternet.getInstance().getDefaultTracker();
+        assertEquals(t, ATInternet.getInstance().getDefaultTracker());
     }
 
     @Test
-    public void isOfflineTest() {
-        assertFalse(hit.isOffline());
+    public void getOtherTracker() {
+        Tracker tracker = ATInternet.getInstance().getTracker(RuntimeEnvironment.application, "test");
+        assertEquals(tracker, ATInternet.getInstance().getTracker(RuntimeEnvironment.application, "test"));
     }
-}
+}
\ No newline at end of file
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/AbstractTestClass.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/AbstractTestClass.java
index 77c8d89e..97d89923 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/AbstractTestClass.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/AbstractTestClass.java
@@ -34,6 +34,7 @@ public abstract class AbstractTestClass {
     final String pattern = "dd-MM-yyyy";
     String today;
     Tracker tracker;
+    Buffer buffer;
 
     @Before
     public void setUp() throws Exception {
@@ -58,6 +59,9 @@ public void setUp() throws Exception {
             put("sessionBackgroundDuration", 60);
         }};
         tracker = new Tracker(RuntimeEnvironment.application, conf);
+        buffer = tracker.getBuffer();
+        buffer.getPersistentParams().clear();
+        buffer.getVolatileParams().clear();
     }
 
     // Méthode rendant accessible un attribut privé
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/AisleTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/AisleTest.java
index 1e6160da..fad3d2b5 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/AisleTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/AisleTest.java
@@ -10,18 +10,16 @@
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertNull;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class AisleTest extends AbstractTestClass {
 
     private Aisle aisle;
-    private Buffer buffer;
 
     @Before
     public void setUp() throws Exception {
         super.setUp();
         aisle = new Aisle(tracker);
-        buffer = tracker.getBuffer();
     }
 
     @Test
@@ -39,23 +37,14 @@ public void multiInstancesTest() {
         assertNotSame(aisle, new Aisle(tracker));
     }
 
-    @Test
-    public void setTest() {
-        assertEquals("level1", aisle.setLevel1("level1").getLevel1());
-        assertEquals("level2", aisle.setLevel2("level2").getLevel2());
-        assertEquals("level3", aisle.setLevel3("level3").getLevel3());
-        assertEquals("level4", aisle.setLevel4("level4").getLevel4());
-        assertEquals("level5", aisle.setLevel5("level5").getLevel5());
-        assertEquals("level6", aisle.setLevel6("level6").getLevel6());
-    }
-
     @Test
     public void setEventTest() {
         aisle.setLevel1("level1").setLevel2("level2").setLevel4("level4").setEvent();
 
         assertEquals(1, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("aisl", buffer.getVolatileParams().get(0).getKey());
-        assertEquals("level1::level2::level4", buffer.getVolatileParams().get(0).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("aisl").getValues().size());
+        assertEquals("level1::level2::level4", buffer.getVolatileParams().get("aisl").getValues().get(0).execute());
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/AislesTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/AislesTest.java
index 87f00ae7..2d6557dd 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/AislesTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/AislesTest.java
@@ -28,11 +28,9 @@ of this software and associated documentation files (the "Software"), to deal
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-import java.util.Random;
-
 import static org.junit.Assert.assertEquals;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class AislesTest extends AbstractTestClass {
 
@@ -46,26 +44,7 @@ public void setUp() throws Exception {
 
     @Test
     public void addTest() {
-        Random r = new Random();
-        String[] levels = {
-                String.valueOf(r.nextInt(500)),
-                String.valueOf(r.nextInt(500)),
-                String.valueOf(r.nextInt(500)),
-                String.valueOf(r.nextInt(500)),
-                String.valueOf(r.nextInt(500)),
-                String.valueOf(r.nextInt(500))
-        };
-        int i = 0;
-
-        Aisle aisle = aisles.add(levels[i++], levels[i++], levels[i++], levels[i++], levels[i++], levels[i]);
+        aisles.add("level1");
         assertEquals(1, tracker.getBusinessObjects().size());
-        i = 0;
-
-        assertEquals(levels[i++], ((Aisle) tracker.getBusinessObjects().get(aisle.getId())).getLevel1());
-        assertEquals(levels[i++], ((Aisle) tracker.getBusinessObjects().get(aisle.getId())).getLevel2());
-        assertEquals(levels[i++], ((Aisle) tracker.getBusinessObjects().get(aisle.getId())).getLevel3());
-        assertEquals(levels[i++], ((Aisle) tracker.getBusinessObjects().get(aisle.getId())).getLevel4());
-        assertEquals(levels[i++], ((Aisle) tracker.getBusinessObjects().get(aisle.getId())).getLevel5());
-        assertEquals(levels[i], ((Aisle) tracker.getBusinessObjects().get(aisle.getId())).getLevel6());
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/AudioTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/AudioTest.java
index 5c627568..045a7ad5 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/AudioTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/AudioTest.java
@@ -31,16 +31,13 @@ of this software and associated documentation files (the "Software"), to deal
 import java.util.Random;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class AudioTest extends AbstractTestClass {
 
     private Audio audio;
-    private Buffer buffer;
     private MediaPlayer player;
 
     @Before
@@ -48,20 +45,6 @@ public void setUp() throws Exception {
         super.setUp();
         player = new MediaPlayer(tracker);
         audio = new Audio(player);
-        buffer = tracker.getBuffer();
-    }
-
-    @Test
-    public void initTest() {
-        assertEquals(-1, audio.getLevel2());
-        assertEquals(0, audio.getDuration());
-        assertNull(audio.getWebDomain());
-        assertEquals("", audio.getName());
-        assertEquals("audio", audio.getType());
-        assertNull(audio.getAction());
-        assertEquals(RichMedia.BroadcastMode.Clip, audio.getBroadcastMode());
-        assertFalse(audio.isBuffering());
-        assertFalse(audio.isEmbedded());
     }
 
     @Test
@@ -69,21 +52,6 @@ public void multiInstancesTest() {
         assertNotSame(audio, new Audio(player));
     }
 
-    @Test
-    public void setTest() {
-        Random r = new Random();
-        boolean rboolean = r.nextBoolean();
-        String val = String.valueOf(r.nextInt(500));
-
-        assertEquals("name", audio.setName("name").getName());
-        assertEquals(3, audio.setDuration(3).getDuration());
-        assertEquals(RichMedia.Action.Stop, audio.setAction(RichMedia.Action.Stop).getAction());
-        assertEquals(rboolean, audio.setBuffering(rboolean).isBuffering());
-        assertEquals(rboolean, audio.setEmbedded(rboolean).isEmbedded());
-        assertEquals(val, audio.setWebDomain(val).getWebDomain());
-        assertEquals(3, audio.setLevel2(3).getLevel2());
-    }
-
     @Test
     public void setEventPlayTest() {
         audio.setDuration(56)
@@ -93,31 +61,30 @@ public void setEventPlayTest() {
                 .setChapter1("chapter1")
                 .setEvent();
         assertEquals(8, buffer.getVolatileParams().size());
-        int i = 0;
 
-        assertEquals("type", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("audio", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("audio", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("chapter1::name", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("chapter1::name", buffer.getVolatileParams().get("p").getValues().get(0).execute());
 
-        assertEquals("a", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("play", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("a").getValues().size());
+        assertEquals("play", buffer.getVolatileParams().get("a").getValues().get(0).execute());
 
-        assertEquals("m6", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("clip", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m6").getValues().size());
+        assertEquals("clip", buffer.getVolatileParams().get("m6").getValues().get(0).execute());
 
-        assertEquals("plyr", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("1", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("plyr").getValues().size());
+        assertEquals("1", buffer.getVolatileParams().get("plyr").getValues().get(0).execute());
 
-        assertEquals("m5", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("int", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m5").getValues().size());
+        assertEquals("int", buffer.getVolatileParams().get("m5").getValues().get(0).execute());
 
-        assertEquals("s2", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("4", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("s2").getValues().size());
+        assertEquals("4", buffer.getVolatileParams().get("s2").getValues().get(0).execute());
 
-        assertEquals("m1", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("56", buffer.getVolatileParams().get(i).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m1").getValues().size());
+        assertEquals("56", buffer.getVolatileParams().get("m1").getValues().get(0).execute());
     }
 
     @Test
@@ -129,31 +96,30 @@ public void setEventRefreshTest() {
                 .setChapter1("chapter1")
                 .setEvent();
         assertEquals(8, buffer.getVolatileParams().size());
-        int i = 0;
 
-        assertEquals("type", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("audio", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("audio", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("chapter1::name", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("chapter1::name", buffer.getVolatileParams().get("p").getValues().get(0).execute());
 
-        assertEquals("a", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("refresh", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("a").getValues().size());
+        assertEquals("refresh", buffer.getVolatileParams().get("a").getValues().get(0).execute());
 
-        assertEquals("m6", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("clip", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m6").getValues().size());
+        assertEquals("clip", buffer.getVolatileParams().get("m6").getValues().get(0).execute());
 
-        assertEquals("plyr", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("1", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("plyr").getValues().size());
+        assertEquals("1", buffer.getVolatileParams().get("plyr").getValues().get(0).execute());
 
-        assertEquals("m5", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("int", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m5").getValues().size());
+        assertEquals("int", buffer.getVolatileParams().get("m5").getValues().get(0).execute());
 
-        assertEquals("s2", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("4", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("s2").getValues().size());
+        assertEquals("4", buffer.getVolatileParams().get("s2").getValues().get(0).execute());
 
-        assertEquals("m1", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("56", buffer.getVolatileParams().get(i).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m1").getValues().size());
+        assertEquals("56", buffer.getVolatileParams().get("m1").getValues().get(0).execute());
     }
 
     @Test
@@ -165,31 +131,30 @@ public void setEventPauseTest() {
                 .setChapter1("chapter1")
                 .setEvent();
         assertEquals(8, buffer.getVolatileParams().size());
-        int i = 0;
 
-        assertEquals("type", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("audio", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("audio", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("chapter1::name", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("chapter1::name", buffer.getVolatileParams().get("p").getValues().get(0).execute());
 
-        assertEquals("a", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("pause", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("a").getValues().size());
+        assertEquals("pause", buffer.getVolatileParams().get("a").getValues().get(0).execute());
 
-        assertEquals("m6", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("clip", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m6").getValues().size());
+        assertEquals("clip", buffer.getVolatileParams().get("m6").getValues().get(0).execute());
 
-        assertEquals("plyr", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("1", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("plyr").getValues().size());
+        assertEquals("1", buffer.getVolatileParams().get("plyr").getValues().get(0).execute());
 
-        assertEquals("m5", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("int", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m5").getValues().size());
+        assertEquals("int", buffer.getVolatileParams().get("m5").getValues().get(0).execute());
 
-        assertEquals("s2", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("4", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("s2").getValues().size());
+        assertEquals("4", buffer.getVolatileParams().get("s2").getValues().get(0).execute());
 
-        assertEquals("m1", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("56", buffer.getVolatileParams().get(i).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m1").getValues().size());
+        assertEquals("56", buffer.getVolatileParams().get("m1").getValues().get(0).execute());
     }
 
     @Test
@@ -201,30 +166,29 @@ public void setEventStopTest() {
                 .setChapter1("chapter1")
                 .setEvent();
         assertEquals(8, buffer.getVolatileParams().size());
-        int i = 0;
 
-        assertEquals("type", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("audio", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("audio", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("chapter1::name", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("chapter1::name", buffer.getVolatileParams().get("p").getValues().get(0).execute());
 
-        assertEquals("a", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("stop", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("a").getValues().size());
+        assertEquals("stop", buffer.getVolatileParams().get("a").getValues().get(0).execute());
 
-        assertEquals("m6", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("clip", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m6").getValues().size());
+        assertEquals("clip", buffer.getVolatileParams().get("m6").getValues().get(0).execute());
 
-        assertEquals("plyr", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("1", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("plyr").getValues().size());
+        assertEquals("1", buffer.getVolatileParams().get("plyr").getValues().get(0).execute());
 
-        assertEquals("m5", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("int", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m5").getValues().size());
+        assertEquals("int", buffer.getVolatileParams().get("m5").getValues().get(0).execute());
 
-        assertEquals("s2", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("4", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("s2").getValues().size());
+        assertEquals("4", buffer.getVolatileParams().get("s2").getValues().get(0).execute());
 
-        assertEquals("m1", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("56", buffer.getVolatileParams().get(i).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m1").getValues().size());
+        assertEquals("56", buffer.getVolatileParams().get("m1").getValues().get(0).execute());
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/AudiosTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/AudiosTest.java
index 9cea083b..59147665 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/AudiosTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/AudiosTest.java
@@ -26,11 +26,6 @@ public void setUp() throws Exception {
         audios = new Audios(player);
     }
 
-    @Test
-    public void initTest() {
-        assertTrue(true);
-    }
-
     @Test
     public void addOneTest() {
         audios.add("name", 80);
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/BufferTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/BufferTest.java
index 8a67ec14..0f475a91 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/BufferTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/BufferTest.java
@@ -28,29 +28,25 @@ of this software and associated documentation files (the "Software"), to deal
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-import java.util.ArrayList;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
-public final class BufferTest extends AbstractTestClass {
+public class BufferTest extends AbstractTestClass {
 
-    private Buffer buffer;
     private Param param;
 
     @Before
     public void setUp() throws Exception {
         super.setUp();
-        buffer = new Buffer(tracker);
         param = new Param("key", new Closure() {
             @Override
             public String execute() {
                 return "value";
             }
-        }, Param.Type.String);
+        });
     }
 
     @Test
@@ -61,55 +57,28 @@ public void multiInstanceTest() {
 
     @Test
     public void addPersistentParameterTest() {
-        buffer.getPersistentParams().add(param);
-        assertEquals(16, buffer.getPersistentParams().size());
+        buffer.getPersistentParams().put(param.getKey(), param);
+        assertEquals(1, buffer.getPersistentParams().size());
     }
 
     @Test
     public void addVolatileParameterTest() {
-        buffer.getVolatileParams().add(param);
+        buffer.getVolatileParams().put(param.getKey(), param);
         assertEquals(1, buffer.getVolatileParams().size());
     }
 
-    @Test
-    public void getPersistentParameterTest() {
-        buffer.getPersistentParams().add(param);
-        ArrayList<int[]> indexes = Tool.findParameterPosition(param.getKey(), buffer.getPersistentParams());
-        int position = indexes.get(indexes.size() - 1)[1];
-        Param p = buffer.getPersistentParams().get(position);
-
-        assertEquals(param.getKey(), p.getKey());
-        assertEquals(param.getValue(), p.getValue());
-    }
-
-    @Test
-    public void getVolatileParameterTest() {
-        buffer.getVolatileParams().add(param);
-        ArrayList<int[]> indexes = Tool.findParameterPosition(param.getKey(), buffer.getVolatileParams());
-        int position = indexes.get(indexes.size() - 1)[1];
-        Param p = buffer.getVolatileParams().get(position);
-
-        assertEquals(param.getKey(), p.getKey());
-        assertEquals(param.getValue(), p.getValue());
-    }
-
     @Test
     public void setIdentifierKey() {
         buffer.setIdentifierKey("androidId");
-        for (Param p : buffer.getPersistentParams()) {
-            if (p.getKey().equals("idclient")) {
-                assertEquals(TechnicalContext.getUserId("androidId").execute(), p.getValue().execute());
-            }
-        }
+        assertEquals(TechnicalContext.getUserId("androidId").execute(), buffer.getPersistentParams().get("idclient").getValues().get(0).execute());
     }
 
     @Test
     public void addContextVariablesTest() throws Exception {
-        buffer.getPersistentParams().clear();
         executePrivateMethod(buffer, "addContextVariables", new Object[]{tracker});
         assertEquals(15, buffer.getPersistentParams().size());
-        assertEquals(TechnicalContext.VTAG.execute(), buffer.getPersistentParams().get(0).getValue().execute());
-        assertEquals("Android", buffer.getPersistentParams().get(1).getValue().execute());
+        assertEquals(TechnicalContext.VTAG.execute(), buffer.getPersistentParams().get("vtag").getValues().get(0).execute());
+        assertEquals("Android", buffer.getPersistentParams().get("ptag").getValues().get(0).execute());
     }
 
     @Test
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/BuilderTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/BuilderTest.java
index 3fcc53a6..31169b85 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/BuilderTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/BuilderTest.java
@@ -22,15 +22,15 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
-import android.text.format.DateFormat;
+import android.util.Pair;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 
 import static org.junit.Assert.assertEquals;
@@ -39,119 +39,21 @@ of this software and associated documentation files (the "Software"), to deal
 
 @Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
+@SuppressWarnings("unchecked")
 public class BuilderTest extends AbstractTestClass {
 
-    private Buffer buffer;
     private Builder builder;
-    private Param intParam;
-    private Param floatParam;
-    private Param booleanParam;
-    private Param arrayParam;
-    private Param mapParam;
-    private Param closureParam;
-    private Param stringParam;
-
-    @Before
-    public void setUp() throws Exception {
-        super.setUp();
-        prepareBuilderForTest();
-    }
 
     @Test
     public void buildPhoneConfigurationTest() throws Exception {
         builder = new Builder(tracker);
-        String result = (String) executePrivateMethod(builder, "buildConfiguration", new Object[0]);
+        String result = builder.buildConfiguration();
         assertEquals(result, "http://logp.xiti.com/hit.xiti?s=552987");
-    }
-
-    @Test
-    public void buildClosureTest() {
-        String today = getDate().execute();
-
-        buffer.getVolatileParams().add(stringParam);
-        buffer.getVolatileParams().add(closureParam);
-        builder = new Builder(tracker);
-        String hit = ((ArrayList<String>) builder.build()[0]).get(0);
-
-        assertEquals("p=home", hit.split("&")[1]);
-        assertEquals("date=" + today, hit.split("&")[2]);
-        assertEquals("refstore=test", hit.split("&")[3]);
-        assertEquals("ref=www.atinternet.com?test1=1$test2=2$test3=script/script", hit.split("&")[4]);
-    }
-
-    @Test
-    public void buildFloatTest() {
-        buffer.getVolatileParams().add(floatParam);
-
-        builder = new Builder(tracker);
-        String hit = ((ArrayList<String>) builder.build()[0]).get(0);
 
-        assertEquals("float=3.145", hit.split("&")[1]);
-        assertEquals("refstore=test", hit.split("&")[2]);
-        assertEquals("ref=www.atinternet.com?test1=1$test2=2$test3=script/script", hit.split("&")[3]);
-    }
-
-    @Test
-    public void buildIntTest() {
-        buffer.getVolatileParams().add(intParam);
-        builder = new Builder(tracker);
-        String hit = ((ArrayList<String>) builder.build()[0]).get(0);
-
-        assertEquals("int=20", hit.split("&")[1]);
-        assertEquals("refstore=test", hit.split("&")[2]);
-        assertEquals("ref=www.atinternet.com?test1=1$test2=2$test3=script/script", hit.split("&")[3]);
-    }
-
-    @Test
-    public void buildBooleanTest() {
-        buffer.getVolatileParams().add(booleanParam);
-        buffer.getVolatileParams().add(new Param("falseBoolean", closureValue(false), Param.Type.Array));
+        tracker.setConfig(TrackerConfigurationKeys.LOG, "", null, true);
         builder = new Builder(tracker);
-        String hit = ((ArrayList<String>) builder.build()[0]).get(0);
-
-        assertEquals("trueBoolean=true", hit.split("&")[1]);
-        assertEquals("falseBoolean=false", hit.split("&")[2]);
-        assertEquals("refstore=test", hit.split("&")[3]);
-        assertEquals("ref=www.atinternet.com?test1=1$test2=2$test3=script/script", hit.split("&")[4]);
-
-    }
-
-    @Test
-    public void buildMapTest() {
-        buffer.getVolatileParams().add(mapParam);
-        builder = new Builder(tracker);
-        String hit = ((ArrayList<String>) builder.build()[0]).get(0);
-
-        assertEquals("map={\"fruit\":\"orange\"}", hit.split("&")[1]);
-        assertEquals("refstore=test", hit.split("&")[2]);
-        assertEquals("ref=www.atinternet.com?test1=1$test2=2$test3=script/script", hit.split("&")[3]);
-    }
-
-    @Test
-    public void buildArrayTest() {
-        buffer.getVolatileParams().add(arrayParam);
-        builder = new Builder(tracker);
-        String hit = ((ArrayList<String>) builder.build()[0]).get(0);
-
-        assertEquals("array=jeu,dvd,bluray", hit.split("&")[1]);
-        assertEquals("refstore=test", hit.split("&")[2]);
-        assertEquals("ref=www.atinternet.com?test1=1$test2=2$test3=script/script", hit.split("&")[3]);
-    }
-
-    @Test
-    public void buildArrayWithOptionTest() {
-        arrayParam = new Param("array", closureValue(Tool.convertToString(new ArrayList<Object>() {{
-            add("jeu");
-            add("dvd");
-            add("bluray");
-        }}, "/")), Param.Type.Array);
-        buffer.getVolatileParams().add(arrayParam);
-        builder = new Builder(tracker);
-        String hit = ((ArrayList<String>) builder.build()[0]).get(0);
-
-        assertEquals("array=jeu/dvd/bluray", hit.split("&")[1]);
-        assertEquals("refstore=test", hit.split("&")[2]);
-        assertEquals("ref=www.atinternet.com?test1=1$test2=2$test3=script/script", hit.split("&")[3]);
+        result = builder.buildConfiguration();
+        assertEquals(result, "");
     }
 
     @Test
@@ -160,7 +62,7 @@ public void multiHitsFailedNotSplittableParameterTest() {
         for (int i = 1; i <= 150; i++) {
             array.add("verybigvalue" + i);
         }
-        buffer.getVolatileParams().add(new Param("test", closureValue(Tool.convertToString(array, null)), Param.Type.Array));
+        buffer.getVolatileParams().put("test", new Param("test", closureValue(Tool.convertToString(array, null))));
         builder = new Builder(tracker);
 
         ArrayList<String> hits = (ArrayList<String>) builder.build()[0];
@@ -176,7 +78,7 @@ public void multiHitsFailedNotSplittableValueTest() {
         for (int i = 1; i <= 150; i++) {
             s += "verybigvalue" + i;
         }
-        buffer.getVolatileParams().add(new Param("stc", closureValue(s), Param.Type.String));
+        buffer.getVolatileParams().put("stc", new Param("stc", closureValue(s)));
         builder = new Builder(tracker);
 
         ArrayList<String> hits = (ArrayList<String>) builder.build()[0];
@@ -187,18 +89,18 @@ public void multiHitsFailedNotSplittableValueTest() {
 
     @Test
     public void multiHitsOkSplittableParameterTest() {
-        buffer.getPersistentParams().add(new Param("idclient", new Closure() {
+        buffer.getPersistentParams().put("idclient", new Param("idclient", new Closure() {
             @Override
             public String execute() {
                 return "CustomId";
             }
-        }, Param.Type.Closure));
+        }));
         ArrayList<String> array = new ArrayList<>();
         for (int i = 1; i <= 200; i++) {
             array.add("verybigvalue" + i);
         }
         ParamOption options = new ParamOption().setSeparator("|");
-        buffer.getVolatileParams().add(new Param("stc", closureValue(Tool.convertToString(array, "|")), Param.Type.Array, options));
+        buffer.getVolatileParams().put("stc", new Param("stc", closureValue(Tool.convertToString(array, "|")), options));
         builder = new Builder(tracker);
 
         ArrayList<String> hits = (ArrayList<String>) builder.build()[0];
@@ -207,21 +109,21 @@ public String execute() {
         assertFalse(hits.get(1).contains("mherr=1"));
         assertFalse(hits.get(2).contains("mherr=1"));
 
-        assertTrue(hits.get(0).contains("mh=") && hits.get(0).contains("idclient="));
-        assertTrue(hits.get(1).contains("mh=") && hits.get(1).contains("idclient="));
-        assertTrue(hits.get(2).contains("mh=") && hits.get(2).contains("idclient="));
+        assertTrue(hits.get(0).contains("mh="));
+        assertTrue(hits.get(1).contains("mh="));
+        assertTrue(hits.get(2).contains("mh="));
     }
 
     @Test
     public void multiHitsOkSplittableHitTest() {
-        buffer.getPersistentParams().add(new Param("idclient", new Closure() {
+        buffer.getPersistentParams().put("idclient", new Param("idclient", new Closure() {
             @Override
             public String execute() {
                 return "CustomId";
             }
-        }, Param.Type.Closure));
+        }));
         for (int i = 1; i <= 220; i++) {
-            buffer.getVolatileParams().add(new Param("verybigkey" + i, closureValue("verybigvalue" + i), Param.Type.Array));
+            buffer.getVolatileParams().put("verybigkey" + i, new Param("verybigkey" + i, closureValue("verybigvalue" + i)));
         }
         builder = new Builder(tracker);
 
@@ -233,125 +135,198 @@ public String execute() {
         assertFalse(hits.get(3).contains("mherr=1"));
         assertFalse(hits.get(4).contains("mherr=1"));
 
-        assertTrue(hits.get(0).contains("mh=") && hits.get(0).contains("idclient="));
-        assertTrue(hits.get(1).contains("mh=") && hits.get(1).contains("idclient="));
-        assertTrue(hits.get(2).contains("mh=") && hits.get(2).contains("idclient="));
-        assertTrue(hits.get(3).contains("mh=") && hits.get(3).contains("idclient="));
-        assertTrue(hits.get(4).contains("mh=") && hits.get(4).contains("idclient="));
+        assertTrue(hits.get(0).contains("mh=1-5"));
+        assertTrue(hits.get(1).contains("mh=2-5"));
+        assertTrue(hits.get(2).contains("mh=3-5"));
+        assertTrue(hits.get(3).contains("mh=4-5"));
+        assertTrue(hits.get(4).contains("mh=5-5"));
     }
 
     @Test
     public void makeSubQueryTest() throws Exception {
         builder = new Builder(tracker);
-        String result = (String) executePrivateMethod(builder, "makeSubQuery", new Object[]{"p", "test"});
+        String result = builder.makeSubQuery("p", "test");
         assertEquals("&p=test", result);
     }
 
     @Test
     public void organizeParametersTest() throws Exception {
-        ArrayList<Param> completeBuffer = new ArrayList<>();
-        buffer.getPersistentParams().add(stringParam);
-        buffer.getPersistentParams().add(mapParam);
-        buffer.getPersistentParams().add(arrayParam);
-        buffer.getPersistentParams().add(booleanParam);
-        buffer.getPersistentParams().add(intParam);
-        completeBuffer.addAll(buffer.getVolatileParams());
-        completeBuffer.addAll(buffer.getPersistentParams());
+        LinkedHashMap<String, Param> completeBuffer = new LinkedHashMap<>();
+        tracker.setParam("ref", "www.atinternet.com?test1=1&test2=2&test3=<script></script>")
+                .setParam("map", new HashMap())
+                .setParam("refstore", "test")
+                .setParam("p", "page", new ParamOption().setRelativePosition(ParamOption.RelativePosition.last))
+                .setParam("int", 3, new ParamOption().setRelativePosition(ParamOption.RelativePosition.first));
+
+        completeBuffer.putAll(buffer.getVolatileParams());
+        completeBuffer.putAll(buffer.getPersistentParams());
+
         builder = new Builder(tracker);
-        ArrayList<Param> organizeParams = (ArrayList<Param>) executePrivateMethod(builder, "organizeParameters", new Object[]{completeBuffer});
+        ArrayList<Param> organizeParams = builder.organizeParameters(completeBuffer);
 
-        assertEquals(7, organizeParams.size());
-        assertEquals("p", organizeParams.get(0).getKey());
+        assertEquals(5, organizeParams.size());
+        assertEquals("int", organizeParams.get(0).getKey());
         assertEquals("map", organizeParams.get(1).getKey());
-        assertEquals("array", organizeParams.get(2).getKey());
-        assertEquals("trueBoolean", organizeParams.get(3).getKey());
-        assertEquals("int", organizeParams.get(4).getKey());
-        assertEquals("refstore", organizeParams.get(5).getKey());
-        assertEquals("ref", organizeParams.get(6).getKey());
+        assertEquals("p", organizeParams.get(2).getKey());
+        assertEquals("refstore", organizeParams.get(3).getKey());
+        assertEquals("ref", organizeParams.get(4).getKey());
+    }
+
+    @Test
+    public void prepareQuerySuccessTest() throws Exception {
+        tracker.setParam("p", "page")
+                .setParam("p", "page2", new ParamOption().setAppend(true).setSeparator("--"))
+                .setParam("array", "[{\"test\":\"value\"}]")
+                .setParam("array", "[{\"test1\":\"value1\"}]", new ParamOption().setAppend(true))
+                .setParam("test", "value")
+                .setParam("stc", new HashMap() {{
+                    put("key1", "value1");
+                    put("key2", "value2");
+                }})
+                .setParam("stc", new HashMap() {{
+                    put("key3", "value3");
+                }}, new ParamOption().setAppend(true).setPersistent(true))
+                .setParam("stc", new HashMap() {{
+                    put("obj", new HashMap() {{
+                        put("subkey", "subvalue");
+                    }});
+                }}, new ParamOption().setAppend(true));
+        builder = new Builder(tracker);
+        LinkedHashMap<String, Pair<String, String>> formattedParameters = builder.prepareQuery();
+
+        assertEquals(4, formattedParameters.size());
+
+        assertEquals("&p=page--page2", formattedParameters.get("p").first);
+        assertEquals("&array=[{\"test\":\"value\"}, {\"test1\":\"value1\"}]", formattedParameters.get("array").first);
+        assertEquals("&test=value", formattedParameters.get("test").first);
+        assertEquals("&stc={\"key1\":\"value1\",\"key2\":\"value2\",\"key3\":\"value3\",\"obj\":{\"subkey\":\"subvalue\"}}", formattedParameters.get("stc").first);
+
+        buffer.getVolatileParams().clear();
+        builder = new Builder(tracker);
+        formattedParameters = builder.prepareQuery();
+
+        assertEquals(1, formattedParameters.size());
+        assertEquals("&stc={\"key3\":\"value3\"}", formattedParameters.get("stc").first);
     }
 
     @Test
-    public void prepareQueryVolatileTest() throws Exception {
-        buffer.getVolatileParams().add(stringParam);
-        buffer.getVolatileParams().add(mapParam);
-        buffer.getVolatileParams().add(arrayParam);
-        buffer.getVolatileParams().add(booleanParam);
-        buffer.getVolatileParams().add(intParam);
+    public void overrideParam1Test() throws Exception {
+        tracker.setParam("test", "value", new ParamOption().setPersistent(true))
+                .setParam("test", "value2");
+        builder = new Builder(tracker);
+        LinkedHashMap<String, Pair<String, String>> formattedParameters = builder.prepareQuery();
+
+        assertEquals(1, formattedParameters.size());
+        assertEquals("&test=value2", formattedParameters.get("test").first);
+        buffer.getVolatileParams().clear();
+
         builder = new Builder(tracker);
-        LinkedHashMap<String, Object[]> result = (LinkedHashMap<String, Object[]>) executePrivateMethod(builder, "prepareQuery", new Object[0]);
-
-        assertEquals(7, result.size());
-        assertEquals("&p=home", result.get("p")[1]);
-        assertEquals("&map=" + "{\"fruit\":\"orange\"}", result.get("map")[1]);
-        assertEquals("&array=" + "jeu,dvd,bluray", result.get("array")[1]);
-        assertEquals("&trueBoolean=true", result.get("trueBoolean")[1]);
-        assertEquals("&int=20", result.get("int")[1]);
-        assertEquals("&refstore=test", result.get("refstore")[1]);
-        assertEquals("&ref=www.atinternet.com?test1=1$test2=2$test3=script/script", result.get("ref")[1]);
+        formattedParameters = builder.prepareQuery();
+
+        assertEquals(1, formattedParameters.size());
+        assertEquals("&test=value", formattedParameters.get("test").first);
     }
 
     @Test
-    public void prepareQueryPersistentTest() throws Exception {
-        buffer.getPersistentParams().add(stringParam);
-        buffer.getPersistentParams().add(mapParam);
-        buffer.getPersistentParams().add(arrayParam);
-        buffer.getPersistentParams().add(booleanParam);
-        buffer.getPersistentParams().add(intParam);
-        buffer.getPersistentParams().add(new Param("car", closureValue(""), Param.Type.Closure));
+    public void overrideParam2Test() throws Exception {
+        tracker.setParam("test", "value", new ParamOption().setPersistent(true))
+                .setParam("test", "value2", new ParamOption().setAppend(true));
+
         builder = new Builder(tracker);
-        LinkedHashMap<String, Object[]> result = (LinkedHashMap<String, Object[]>) executePrivateMethod(builder, "prepareQuery", new Object[0]);
-
-        assertEquals(8, result.size());
-        assertEquals("&p=home", result.get("p")[1]);
-        assertEquals("&map=" + "{\"fruit\":\"orange\"}", result.get("map")[1]);
-        assertEquals("&array=" + "jeu,dvd,bluray", result.get("array")[1]);
-        assertEquals("&trueBoolean=true", result.get("trueBoolean")[1]);
-        assertEquals("&int=20", result.get("int")[1]);
-        assertEquals("&car=", result.get("car")[1]);
-        assertEquals("&refstore=test", result.get("refstore")[1]);
-        assertEquals("&ref=www.atinternet.com?test1=1$test2=2$test3=script/script", result.get("ref")[1]);
+        LinkedHashMap<String, Pair<String, String>> formattedParameters = builder.prepareQuery();
+
+        assertEquals(1, formattedParameters.size());
+        assertEquals("&test=value,value2", formattedParameters.get("test").first);
     }
 
-    private void prepareBuilderForTest() {
-        buffer = tracker.getBuffer();
-        buffer.getPersistentParams().clear();
-        buffer.getVolatileParams().add(new Param("ref", new Closure() {
-            @Override
-            public String execute() {
-                return "www.atinternet.com?test1=1&test2=2&test3=<script></script>";
+    @Test
+    public void overrideParam3Test() throws Exception {
+        tracker.setParam("test", "value2")
+                .setParam("test", "value", new ParamOption().setPersistent(true));
+        builder = new Builder(tracker);
+        LinkedHashMap<String, Pair<String, String>> formattedParameters = builder.prepareQuery();
 
-            }
-        }, Param.Type.Closure));
-        buffer.getVolatileParams().add(new Param("refstore", new Closure() {
-            @Override
-            public String execute() {
-                return "test";
-            }
-        }, Param.Type.Closure));
-
-        today = String.valueOf(DateFormat.format(pattern, System.currentTimeMillis()));
-        closureParam = new Param("date", getDate(), Param.Type.Closure);
-        stringParam = new Param("p", closureValue("home"), Param.Type.String);
-        floatParam = new Param("float", closureValue(3.145), Param.Type.Float);
-        intParam = new Param("int", closureValue(20), Param.Type.Integer);
-        booleanParam = new Param("trueBoolean", closureValue(true), Param.Type.Boolean);
-        mapParam = new Param("map", closureValue(Tool.convertToString(new LinkedHashMap<String, String>() {{
-            put("fruit", "orange");
-        }}, null)), Param.Type.JSON);
-        arrayParam = new Param("array", closureValue(Tool.convertToString(new ArrayList<Object>() {{
-            add("jeu");
-            add("dvd");
-            add("bluray");
-        }}, null)), Param.Type.Array);
+        assertEquals(1, formattedParameters.size());
+        assertEquals("&test=value", formattedParameters.get("test").first);
     }
 
-    private Closure getDate() {
-        return new Closure() {
-            @Override
-            public String execute() {
-                return String.valueOf(DateFormat.format(pattern, System.currentTimeMillis()));
-            }
-        };
+    @Test
+    public void appendParam1Test() throws Exception {
+        tracker.setParam("test", "value2")
+                .setParam("test", "value", new ParamOption().setPersistent(true).setAppend(true))
+                .setParam("test", "value3", new ParamOption().setAppend(true));
+        builder = new Builder(tracker);
+        LinkedHashMap<String, Pair<String, String>> formattedParameters = builder.prepareQuery();
+
+        assertEquals(1, formattedParameters.size());
+        assertEquals("&test=value2,value,value3", formattedParameters.get("test").first);
+
+        buffer.getVolatileParams().clear();
+        builder = new Builder(tracker);
+        formattedParameters = builder.prepareQuery();
+
+        assertEquals(1, formattedParameters.size());
+        assertEquals("&test=value", formattedParameters.get("test").first);
+    }
+
+    @Test
+    public void appendParam2Test() throws Exception {
+        tracker.setParam("test", "value2")
+                .setParam("test", "value", new ParamOption().setPersistent(true).setAppend(true))
+                .setParam("test", "value3");
+        builder = new Builder(tracker);
+        LinkedHashMap<String, Pair<String, String>> formattedParameters = builder.prepareQuery();
+
+        assertEquals(1, formattedParameters.size());
+        assertEquals("&test=value3", formattedParameters.get("test").first);
+
+        buffer.getVolatileParams().clear();
+        builder = new Builder(tracker);
+        formattedParameters = builder.prepareQuery();
+
+        assertEquals(1, formattedParameters.size());
+        assertEquals("&test=value", formattedParameters.get("test").first);
+    }
+
+    @Test
+    public void prepareQueryCannotAppendValuesTest() throws Exception {
+        tracker.setParam("array", "[{\"test\":\"value\"}]")
+                .setParam("array", "value", new ParamOption().setAppend(true))
+                .setParam("stc", new HashMap() {{
+                    put("key1", "value1");
+                    put("key2", "value2");
+                }})
+                .setParam("stc", 4, new ParamOption().setAppend(true));
+        builder = new Builder(tracker);
+        LinkedHashMap<String, Pair<String, String>> formattedParameters = builder.prepareQuery();
+
+        assertEquals(2, formattedParameters.size());
+
+        assertEquals("&array=[{\"test\":\"value\"}]", formattedParameters.get("array").first);
+        assertEquals("&stc={\"key1\":\"value1\",\"key2\":\"value2\"}", formattedParameters.get("stc").first);
+    }
+
+    @Test
+    public void buildTest() throws Exception {
+        tracker.setParam("p", "page")
+                .setParam("p", "page2", new ParamOption().setAppend(true).setSeparator("--"))
+                .setParam("array", "[{\"test\":\"value\"}]")
+                .setParam("test", "value")
+                .setParam("stc", new HashMap() {{
+                    put("key1", "value1");
+                    put("key2", "value2");
+                }})
+                .setParam("stc", new HashMap() {{
+                    put("key3", "value3");
+                    put("obj", new HashMap() {{
+                        put("subkey", "subvalue");
+                    }});
+                }}, new ParamOption().setAppend(true));
+        builder = new Builder(tracker);
+        ArrayList<String> hits = (ArrayList<String>) builder.build()[0];
+        assertEquals(1, hits.size());
+
+        assertEquals("http://logp.xiti.com/hit.xiti?s=552987&p=page--page2&array=[{\"test\":\"value\"}]&test=value&stc={\"key1\":\"value1\",\"key2\":\"value2\",\"key3\":\"value3\",\"obj\":{\"subkey\":\"subvalue\"}}", hits.get(0));
     }
 
     private Closure closureValue(final Object object) {
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/CampaignTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/CampaignTest.java
index a84586ca..a0b2076a 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/CampaignTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/CampaignTest.java
@@ -33,18 +33,16 @@ of this software and associated documentation files (the "Software"), to deal
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertNull;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class CampaignTest extends AbstractTestClass {
 
     private Campaign campaign;
-    private Buffer buffer;
 
     @Before
     public void setUp() throws Exception {
         super.setUp();
         campaign = new Campaign(tracker);
-        buffer = tracker.getBuffer();
     }
 
     @Test
@@ -57,21 +55,18 @@ public void multiInstancesTest() {
         assertNotSame(campaign, new Campaign(tracker));
     }
 
-    @Test
-    public void setTest() {
-        assertEquals("campaign", campaign.setCampaignId("campaign").getCampaignId());
-    }
-
     @Test
     public void setEventWithoutRemanenceTest() {
         assertNull(Tracker.getPreferences().getString(TrackerConfigurationKeys.MARKETING_CAMPAIGN_SAVED, null));
 
-        campaign.setCampaignId("campaign").setEvent();
-        assertEquals(1, buffer.getVolatileParams().size());
+        campaign.setCampaignId("campaign")
+                .setEvent();
 
-        assertEquals("xto", buffer.getVolatileParams().get(0).getKey());
-        assertEquals("campaign", buffer.getVolatileParams().get(0).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
 
+        assertEquals(1, buffer.getVolatileParams().get("xto").getValues().size());
+        assertEquals("campaign", buffer.getVolatileParams().get("xto").getValues().get(0).execute());
         assertEquals("campaign", Tracker.getPreferences().getString(TrackerConfigurationKeys.MARKETING_CAMPAIGN_SAVED, null));
 
     }
@@ -87,14 +82,16 @@ public void setEventWithRemanenceTest() {
         Tracker.getPreferences().edit().putLong(TrackerConfigurationKeys.LAST_MARKETING_CAMPAIGN_TIME, System.currentTimeMillis()).apply();
         assertEquals("campaign", Tracker.getPreferences().getString(TrackerConfigurationKeys.MARKETING_CAMPAIGN_SAVED, null));
 
-        campaign.setCampaignId("test").setEvent();
+        campaign.setCampaignId("test")
+                .setEvent();
         assertEquals(2, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("xto", buffer.getVolatileParams().get(0).getKey());
-        assertEquals("test", buffer.getVolatileParams().get(0).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("xto").getValues().size());
+        assertEquals("test", buffer.getVolatileParams().get("xto").getValues().get(0).execute());
 
-        assertEquals("xtor", buffer.getVolatileParams().get(1).getKey());
-        assertEquals("campaign", buffer.getVolatileParams().get(1).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("xtor").getValues().size());
+        assertEquals("campaign", buffer.getVolatileParams().get("xtor").getValues().get(0).execute());
 
         assertEquals("campaign", Tracker.getPreferences().getString(TrackerConfigurationKeys.MARKETING_CAMPAIGN_SAVED, null));
 
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/CampaignsTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/CampaignsTest.java
index d08232bd..504aa0d9 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/CampaignsTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/CampaignsTest.java
@@ -32,7 +32,7 @@ of this software and associated documentation files (the "Software"), to deal
 
 import static org.junit.Assert.assertEquals;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class CampaignsTest extends AbstractTestClass {
 
@@ -47,8 +47,7 @@ public void setUp() throws Exception {
     @Test
     public void addTest() {
         int id = new Random().nextInt(500);
-        Campaign campaign = campaigns.add("campaign" + id);
+        campaigns.add("campaign" + id);
         assertEquals(1, tracker.getBusinessObjects().size());
-        assertEquals("campaign" + id, ((Campaign) tracker.getBusinessObjects().get(campaign.getId())).getCampaignId());
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/CartTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/CartTest.java
index 1bd09b4e..4bd29463 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/CartTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/CartTest.java
@@ -29,22 +29,19 @@ of this software and associated documentation files (the "Software"), to deal
 import org.robolectric.annotation.Config;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertNull;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class CartTest extends AbstractTestClass {
 
     private Cart cart;
-    private Buffer buffer;
 
     @Before
     public void setUp() throws Exception {
         super.setUp();
         cart = new Cart(tracker);
-        buffer = tracker.getBuffer();
     }
 
     @Test
@@ -57,14 +54,10 @@ public void multiInstancesTest() {
         assertNotSame(cart, new Cart(tracker));
     }
 
-    @Test
-    public void setTest() {
-        assertEquals("90", cart.setCartId("90").getCartId());
-    }
-
     @Test
     public void setEventTest() {
-        Product p = cart.setCartId("76").Products().add("pdtid")
+        cart.setCartId("76")
+                .Products().add("pdtid")
                 .setCategory1("cat")
                 .setCategory2("chap1")
                 .setQuantity(2)
@@ -74,34 +67,31 @@ public void setEventTest() {
                 .setPromotionalCode("promo")
                 .setUnitPriceTaxIncluded(7.0);
 
-        assertNotNull(p.getId());
-
-
         cart.setEvent();
         assertEquals(8, buffer.getVolatileParams().size());
 
-        assertEquals("idcart", buffer.getVolatileParams().get(0).getKey());
-        assertEquals("76", buffer.getVolatileParams().get(0).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("idcart").getValues().size());
+        assertEquals("76", buffer.getVolatileParams().get("idcart").getValues().get(0).execute());
 
-        assertEquals("pdt1", buffer.getVolatileParams().get(1).getKey());
-        assertEquals("cat::chap1::pdtid", buffer.getVolatileParams().get(1).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("pdt1").getValues().size());
+        assertEquals("cat::chap1::pdtid", buffer.getVolatileParams().get("pdt1").getValues().get(0).execute());
 
-        assertEquals("qte1", buffer.getVolatileParams().get(2).getKey());
-        assertEquals("2", buffer.getVolatileParams().get(2).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("qte1").getValues().size());
+        assertEquals("2", buffer.getVolatileParams().get("qte1").getValues().get(0).execute());
 
-        assertEquals("mtht1", buffer.getVolatileParams().get(3).getKey());
-        assertEquals("6.0", buffer.getVolatileParams().get(3).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("mtht1").getValues().size());
+        assertEquals("6.0", buffer.getVolatileParams().get("mtht1").getValues().get(0).execute());
 
-        assertEquals("mt1", buffer.getVolatileParams().get(4).getKey());
-        assertEquals("7.0", buffer.getVolatileParams().get(4).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("mt1").getValues().size());
+        assertEquals("7.0", buffer.getVolatileParams().get("mt1").getValues().get(0).execute());
 
-        assertEquals("dscht1", buffer.getVolatileParams().get(5).getKey());
-        assertEquals("4.0", buffer.getVolatileParams().get(5).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("dscht1").getValues().size());
+        assertEquals("4.0", buffer.getVolatileParams().get("dscht1").getValues().get(0).execute());
 
-        assertEquals("dsc1", buffer.getVolatileParams().get(6).getKey());
-        assertEquals("4.0", buffer.getVolatileParams().get(6).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("dsc1").getValues().size());
+        assertEquals("4.0", buffer.getVolatileParams().get("dsc1").getValues().get(0).execute());
 
-        assertEquals("pcode1", buffer.getVolatileParams().get(7).getKey());
-        assertEquals("promo", buffer.getVolatileParams().get(7).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("pcode1").getValues().size());
+        assertEquals("promo", buffer.getVolatileParams().get("pcode1").getValues().get(0).execute());
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ConfigurationTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ConfigurationTest.java
index 08fba60b..37bd688d 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ConfigurationTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ConfigurationTest.java
@@ -33,7 +33,7 @@ of this software and associated documentation files (the "Software"), to deal
 
 import static org.junit.Assert.assertEquals;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class ConfigurationTest extends AbstractTestClass {
 
@@ -70,15 +70,16 @@ public void getDefaultConfigurationTest() {
     @Test
     public void configurationWithDictionaryTest() {
 
-        LinkedHashMap<String, Object> dictionary = new LinkedHashMap<>();
-        dictionary.put("log", "logtest");
-        dictionary.put("logSSL", "");
-        dictionary.put("site", "123456");
-        dictionary.put("domain", "test.com");
-        dictionary.put("pixelPath", "/test.xiti");
-        dictionary.put("secure", false);
-        dictionary.put("hashUserId", true);
-        dictionary.put("identifier", "androidId");
+        LinkedHashMap<String, Object> dictionary = new LinkedHashMap<String, Object>() {{
+            put("log", "logtest");
+            put("logSSL", "");
+            put("site", "123456");
+            put("domain", "test.com");
+            put("pixelPath", "/test.xiti");
+            put("secure", false);
+            put("hashUserId", true);
+            put("identifier", "androidId");
+        }};
 
         defaultConfiguration = new Configuration(dictionary);
 
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ContextTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ContextTest.java
index d06361f2..c534e02c 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ContextTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ContextTest.java
@@ -31,19 +31,16 @@ of this software and associated documentation files (the "Software"), to deal
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class ContextTest extends AbstractTestClass {
 
     private Context context;
-    private Buffer buffer;
 
     @Before
     public void setUp() throws Exception {
         super.setUp();
         context = new Context(tracker);
-        buffer = tracker.getBuffer();
-        buffer.getPersistentParams().clear();
     }
 
     @Test
@@ -56,9 +53,11 @@ public void initGlobalTest() {
     public void setBackgroundModeTest() {
         context.setBackgroundMode(Context.BackgroundMode.Task);
 
+        assertEquals(0, buffer.getVolatileParams().size());
         assertEquals(1, buffer.getPersistentParams().size());
-        assertEquals("bg", buffer.getPersistentParams().get(0).getKey());
-        assertEquals("task", buffer.getPersistentParams().get(0).getValue().execute());
+
+        assertEquals(1, buffer.getPersistentParams().get("bg").getValues().size());
+        assertEquals("task", buffer.getPersistentParams().get("bg").getValues().get(0).execute());
     }
 
     @Test
@@ -67,15 +66,18 @@ public void unsetBackgroundModeTest() {
         context.setBackgroundMode(Context.BackgroundMode.Normal);
 
         assertEquals(0, buffer.getPersistentParams().size());
+        assertEquals(0, buffer.getVolatileParams().size());
     }
 
     @Test
     public void setLevel2Test() {
         context.setLevel2(4);
 
+        assertEquals(0, buffer.getVolatileParams().size());
         assertEquals(1, buffer.getPersistentParams().size());
-        assertEquals("s2", buffer.getPersistentParams().get(0).getKey());
-        assertEquals("4", buffer.getPersistentParams().get(0).getValue().execute());
+
+        assertEquals(1, buffer.getPersistentParams().get("s2").getValues().size());
+        assertEquals("4", buffer.getPersistentParams().get("s2").getValues().get(0).execute());
     }
 
     @Test
@@ -84,5 +86,6 @@ public void unsetLevel2Test() {
         context.setLevel2(0);
 
         assertEquals(0, buffer.getPersistentParams().size());
+        assertEquals(0, buffer.getVolatileParams().size());
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/CustomObjectTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/CustomObjectTest.java
index c7aeae29..57d68603 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/CustomObjectTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/CustomObjectTest.java
@@ -22,7 +22,6 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
@@ -30,27 +29,22 @@ of this software and associated documentation files (the "Software"), to deal
 
 import static org.junit.Assert.assertEquals;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class CustomObjectTest extends AbstractTestClass {
 
-    private CustomObject customObject;
-    private Buffer buffer;
-
-    @Before
-    public void setUp() throws Exception {
-        super.setUp();
-        customObject = new CustomObject(tracker);
-        buffer = tracker.getBuffer();
-    }
-
     @Test
     public void setEventTest() {
-        customObject.setValue("{\"obj\":{\"key\":\"value\"}}").setEvent();
+        new CustomObject(tracker).setValue("{\"obj\":{\"key\":\"value\"}}").setEvent();
+        new CustomObject(tracker).setValue("{\"key\":\"value\"}").setEvent();
+        new CustomObject(tracker).setValue("{\"key1\":\"value1\"}").setEvent();
 
         assertEquals(1, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("stc", buffer.getVolatileParams().get(0).getKey());
-        assertEquals("{\"obj\":{\"key\":\"value\"}}", buffer.getVolatileParams().get(0).getValue().execute());
+        assertEquals(3, buffer.getVolatileParams().get("stc").getValues().size());
+        assertEquals("{\"obj\":{\"key\":\"value\"}}", buffer.getVolatileParams().get("stc").getValues().get(0).execute());
+        assertEquals("{\"key\":\"value\"}", buffer.getVolatileParams().get("stc").getValues().get(1).execute());
+        assertEquals("{\"key1\":\"value1\"}", buffer.getVolatileParams().get("stc").getValues().get(2).execute());
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/CustomObjectsTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/CustomObjectsTest.java
index 71ed2525..5cbff2e8 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/CustomObjectsTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/CustomObjectsTest.java
@@ -32,23 +32,79 @@ of this software and associated documentation files (the "Software"), to deal
 
 import static org.junit.Assert.assertEquals;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class CustomObjectsTest extends AbstractTestClass {
 
-    private CustomObjects customObjects;
+    @Test
+    public void addAndRemoveInTrackerTest() throws JSONException {
+        CustomObjects customObjects = new CustomObjects(tracker);
+        CustomObject co = customObjects.add(new JSONObject().put("key", "value").toString());
+        assertEquals(1, tracker.getBusinessObjects().size());
 
-    @Before
-    public void setUp() throws Exception {
-        super.setUp();
-        customObjects = new CustomObjects(tracker);
+        customObjects.remove(co.getId());
+        assertEquals(0, tracker.getBusinessObjects().size());
     }
 
     @Test
-    public void addTest() throws JSONException {
-        CustomObject obj = customObjects.add(new JSONObject().put("key", "value").toString());
-        assertEquals(1, tracker.getBusinessObjects().size());
-        assertEquals("{\"key\":\"value\"}", ((CustomObject) tracker.getBusinessObjects().get(obj.getId())).getValue());
+    public void addAndRemoveInScreenTest() throws JSONException {
+        Screen screen = new Screen(tracker);
+        CustomObjects customObjects = new CustomObjects(screen);
+        CustomObject co = customObjects.add(new JSONObject().put("key", "value").toString());
+        assertEquals(0, tracker.getBusinessObjects().size());
+        assertEquals(1, screen.getCustomObjectsMap().size());
+
+        customObjects.remove(co.getId());
+        assertEquals(0, screen.getCustomObjectsMap().size());
     }
 
+    @Test
+    public void addAndRemoveInGestureTest() throws JSONException {
+        Gesture g = new Gesture(tracker);
+        CustomObjects customObjects = new CustomObjects(g);
+        CustomObject co = customObjects.add(new JSONObject().put("key", "value").toString());
+        assertEquals(0, tracker.getBusinessObjects().size());
+        assertEquals(1, g.getCustomObjectsMap().size());
+
+        customObjects.remove(co.getId());
+        assertEquals(0, g.getCustomObjectsMap().size());
+
+    }
+
+    @Test
+    public void addAndRemoveInPublisherTest() throws JSONException {
+        Publisher p = new Publisher(tracker);
+        CustomObjects customObjects = new CustomObjects(p);
+        CustomObject co = customObjects.add(new JSONObject().put("key", "value").toString());
+        assertEquals(0, tracker.getBusinessObjects().size());
+        assertEquals(1, p.getCustomObjectsMap().size());
+
+        customObjects.remove(co.getId());
+        assertEquals(0, p.getCustomObjectsMap().size());
+    }
+
+    @Test
+    public void addAndRemoveInSelfPromotionTest() throws JSONException {
+        SelfPromotion sp = new SelfPromotion(tracker);
+        CustomObjects customObjects = new CustomObjects(sp);
+        CustomObject co = customObjects.add(new JSONObject().put("key", "value").toString());
+        assertEquals(0, tracker.getBusinessObjects().size());
+        assertEquals(1, sp.getCustomObjectsMap().size());
+
+        customObjects.remove(co.getId());
+        assertEquals(0, sp.getCustomObjectsMap().size());
+    }
+
+    @Test
+    public void addAndRemoveInProductTest() throws JSONException {
+        Product p = new Product(tracker);
+        CustomObjects customObjects = new CustomObjects(p);
+        CustomObject co = customObjects.add(new JSONObject().put("key", "value").toString());
+        assertEquals(0, tracker.getBusinessObjects().size());
+        assertEquals(1, p.getCustomObjectsMap().size());
+
+        customObjects.remove(co.getId());
+        assertEquals(0, p.getCustomObjectsMap().size());
+
+    }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/CustomTreeStructureTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/CustomTreeStructureTest.java
index 70192a92..bae35e06 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/CustomTreeStructureTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/CustomTreeStructureTest.java
@@ -31,18 +31,16 @@ of this software and associated documentation files (the "Software"), to deal
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotSame;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class CustomTreeStructureTest extends AbstractTestClass {
 
     private CustomTreeStructure customTreeStructure;
-    private Buffer buffer;
 
     @Before
     public void setUp() throws Exception {
         super.setUp();
         customTreeStructure = new CustomTreeStructure(tracker);
-        buffer = tracker.getBuffer();
     }
 
     @Test
@@ -57,18 +55,15 @@ public void multiInstancesTest() {
         assertNotSame(customTreeStructure, new CustomTreeStructure(tracker));
     }
 
-    @Test
-    public void setTest() {
-        assertEquals(3, customTreeStructure.setCategory1(3).getCategory1());
-        assertEquals(3, customTreeStructure.setCategory2(3).getCategory2());
-        assertEquals(3, customTreeStructure.setCategory3(3).getCategory3());
-    }
-
     @Test
     public void setEventTest() {
-        customTreeStructure.setCategory1(4).setCategory3(4).setEvent();
+        customTreeStructure.setCategory1(4)
+                .setCategory3(4)
+                .setEvent();
         assertEquals(1, buffer.getVolatileParams().size());
-        assertEquals("ptype", buffer.getVolatileParams().get(0).getKey());
-        assertEquals("4-0-4", buffer.getVolatileParams().get(0).getValue().execute());
+        assertEquals(0, buffer.getPersistentParams().size());
+
+        assertEquals(1, buffer.getVolatileParams().get("ptype").getValues().size());
+        assertEquals("4-0-4", buffer.getVolatileParams().get("ptype").getValues().get(0).execute());
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/CustomTreeStructuresTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/CustomTreeStructuresTest.java
index 7b266214..dc6e113b 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/CustomTreeStructuresTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/CustomTreeStructuresTest.java
@@ -32,7 +32,7 @@ of this software and associated documentation files (the "Software"), to deal
 
 import static org.junit.Assert.assertEquals;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class CustomTreeStructuresTest extends AbstractTestClass {
 
@@ -46,37 +46,19 @@ public void setUp() throws Exception {
 
     @Test
     public void addOneTest() {
-        CustomTreeStructure customTreeStructure = customTreeStructures.add(3);
+        customTreeStructures.add(3);
         assertEquals(1, tracker.getBusinessObjects().size());
-        assertEquals(3, ((CustomTreeStructure) tracker.getBusinessObjects().get(customTreeStructure.getId())).getCategory1());
-        assertEquals(0, ((CustomTreeStructure) tracker.getBusinessObjects().get(customTreeStructure.getId())).getCategory2());
-        assertEquals(0, ((CustomTreeStructure) tracker.getBusinessObjects().get(customTreeStructure.getId())).getCategory3());
     }
 
     @Test
     public void addTwoTest() {
-        CustomTreeStructure customTreeStructure = customTreeStructures.add(3, 2);
+        customTreeStructures.add(3, 2);
         assertEquals(1, tracker.getBusinessObjects().size());
-        assertEquals(3, ((CustomTreeStructure) tracker.getBusinessObjects().get(customTreeStructure.getId())).getCategory1());
-        assertEquals(2, ((CustomTreeStructure) tracker.getBusinessObjects().get(customTreeStructure.getId())).getCategory2());
-        assertEquals(0, ((CustomTreeStructure) tracker.getBusinessObjects().get(customTreeStructure.getId())).getCategory3());
     }
 
     @Test
     public void addThreeTest() {
-        Random r = new Random();
-        int[] levels = {
-                r.nextInt(500),
-                r.nextInt(500),
-                r.nextInt(500)
-        };
-        int i = 0;
-        CustomTreeStructure customTreeStructure = customTreeStructures.add(levels[i++], levels[i++], levels[i]);
-        i = 0;
-
+        customTreeStructures.add(1, 1, 1);
         assertEquals(1, tracker.getBusinessObjects().size());
-        assertEquals(levels[i++], ((CustomTreeStructure) tracker.getBusinessObjects().get(customTreeStructure.getId())).getCategory1());
-        assertEquals(levels[i++], ((CustomTreeStructure) tracker.getBusinessObjects().get(customTreeStructure.getId())).getCategory2());
-        assertEquals(levels[i], ((CustomTreeStructure) tracker.getBusinessObjects().get(customTreeStructure.getId())).getCategory3());
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/CustomVarTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/CustomVarTest.java
index 23a097bb..ff4d82cb 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/CustomVarTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/CustomVarTest.java
@@ -31,7 +31,7 @@ of this software and associated documentation files (the "Software"), to deal
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotSame;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class CustomVarTest extends AbstractTestClass {
 
@@ -66,7 +66,7 @@ public void setTest() {
     public void setEventTest() {
         customVar.setValue("test").setEvent();
         assertEquals(1, buffer.getVolatileParams().size());
-        assertEquals("x1", buffer.getVolatileParams().get(0).getKey());
-        assertEquals("test", buffer.getVolatileParams().get(0).getValue().execute());
+        assertEquals("x1", buffer.getVolatileParams().get("x1").getKey());
+        assertEquals("test", buffer.getVolatileParams().get("x1").getValues().get(0).execute());
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/CustomVarsTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/CustomVarsTest.java
index 851e7a8b..abd56b0e 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/CustomVarsTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/CustomVarsTest.java
@@ -30,24 +30,28 @@ of this software and associated documentation files (the "Software"), to deal
 
 import static org.junit.Assert.assertEquals;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class CustomVarsTest extends AbstractTestClass {
 
-    private CustomVars customVars;
+    @Test
+    public void addAndRemoveInTrackerTest() {
+        CustomVars customVars = new CustomVars(tracker);
+        CustomVar cv = customVars.add(4, "test", CustomVar.CustomVarType.App);
+        assertEquals(1, tracker.getBusinessObjects().size());
 
-    @Before
-    public void setUp() throws Exception {
-        super.setUp();
-        customVars = new CustomVars(tracker);
+        customVars.remove(cv.getId());
+        assertEquals(0, tracker.getBusinessObjects().size());
     }
 
     @Test
-    public void addTest() {
-        CustomVar var = customVars.add(4, "test", CustomVar.CustomVarType.App);
-        assertEquals(1, tracker.getBusinessObjects().size());
-        assertEquals(4, ((CustomVar) tracker.getBusinessObjects().get(var.getId())).getVarId());
-        assertEquals("test", ((CustomVar) tracker.getBusinessObjects().get(var.getId())).getValue());
+    public void addAndRemoveInScreenTest() {
+        Screen s = new Screen(tracker);
+        CustomVars customVars = new CustomVars(s);
+        CustomVar cv = customVars.add(4, "test", CustomVar.CustomVarType.App);
+        assertEquals(1, s.getCustomVarsMap().size());
+
+        customVars.remove(cv.getId());
+        assertEquals(0, s.getCustomVarsMap().size());
     }
-
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/DispatcherTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/DispatcherTest.java
index 327a164e..cb6e4309 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/DispatcherTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/DispatcherTest.java
@@ -30,7 +30,7 @@ of this software and associated documentation files (the "Software"), to deal
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class DispatcherTest extends AbstractTestClass {
 
@@ -70,13 +70,13 @@ public void setPersistentIdentifiedVisitorTest() {
         Tracker.getPreferences().edit().putString(IdentifiedVisitor.VISITOR_TEXT, "test").apply();
         dispatcher.setIdentifiedVisitorInfos();
         Assert.assertEquals(3, buffer.getVolatileParams().size());
-        Assert.assertEquals("an", buffer.getVolatileParams().get(0).getKey());
-        Assert.assertEquals("1", buffer.getVolatileParams().get(0).getValue().execute());
+        Assert.assertEquals("an", buffer.getVolatileParams().get("an").getKey());
+        Assert.assertEquals("1", buffer.getVolatileParams().get("an").getValues().get(0).execute());
 
-        Assert.assertEquals("at", buffer.getVolatileParams().get(1).getKey());
-        Assert.assertEquals("test", buffer.getVolatileParams().get(1).getValue().execute());
+        Assert.assertEquals("at", buffer.getVolatileParams().get("at").getKey());
+        Assert.assertEquals("test", buffer.getVolatileParams().get("at").getValues().get(0).execute());
 
-        Assert.assertEquals("ac", buffer.getVolatileParams().get(2).getKey());
-        Assert.assertEquals("3", buffer.getVolatileParams().get(2).getValue().execute());
+        Assert.assertEquals("ac", buffer.getVolatileParams().get("ac").getKey());
+        Assert.assertEquals("3", buffer.getVolatileParams().get("ac").getValues().get(0).execute());
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/DynamicScreenTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/DynamicScreenTest.java
index c8f5b2bc..1c57bb0b 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/DynamicScreenTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/DynamicScreenTest.java
@@ -36,18 +36,16 @@ of this software and associated documentation files (the "Software"), to deal
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertNull;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class DynamicScreenTest extends AbstractTestClass {
 
     private DynamicScreen dynamicScreen;
-    private Buffer buffer;
 
     @Before
     public void setUp() throws Exception {
         super.setUp();
         dynamicScreen = new DynamicScreen(tracker);
-        buffer = tracker.getBuffer();
     }
 
     @Test
@@ -68,76 +66,83 @@ public void setEventTest() {
         dynamicScreen.setScreenId("test").setName("name").setChapter1("chapter1").setUpdate(date).setEvent();
 
         assertEquals(7, buffer.getVolatileParams().size());
-        assertEquals("pid", buffer.getVolatileParams().get(0).getKey());
-        assertEquals("test", buffer.getVolatileParams().get(0).getValue().execute());
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("pchap", buffer.getVolatileParams().get(1).getKey());
-        assertEquals("chapter1", buffer.getVolatileParams().get(1).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("pid").getValues().size());
+        assertEquals("test", buffer.getVolatileParams().get("pid").getValues().get(0).execute());
 
-        assertEquals("pidt", buffer.getVolatileParams().get(2).getKey());
-        assertEquals(new SimpleDateFormat("yyyyMMddHHmm", Locale.getDefault()).format(date), buffer.getVolatileParams().get(2).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("pchap").getValues().size());
+        assertEquals("chapter1", buffer.getVolatileParams().get("pchap").getValues().get(0).execute());
 
-        assertEquals("type", buffer.getVolatileParams().get(3).getKey());
-        assertEquals("screen", buffer.getVolatileParams().get(3).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("pidt").getValues().size());
+        assertEquals(new SimpleDateFormat("yyyyMMddHHmm", Locale.getDefault()).format(date), buffer.getVolatileParams().get("pidt").getValues().get(0).execute());
 
-        assertEquals("action", buffer.getVolatileParams().get(4).getKey());
-        assertEquals("view", buffer.getVolatileParams().get(4).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("screen", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(5).getKey());
-        assertEquals("name", buffer.getVolatileParams().get(5).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("action").getValues().size());
+        assertEquals("view", buffer.getVolatileParams().get("action").getValues().get(0).execute());
+
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("name", buffer.getVolatileParams().get("p").getValues().get(0).execute());
     }
 
     @Test
     public void setEventWithTooLongScreenIdTest() {
         Date date = new Date();
         String id = "";
-        for (int i = 0; i < 256; i++){
+        for (int i = 0; i < 256; i++) {
             id += i;
         }
         dynamicScreen.setScreenId(id).setName("name").setChapter1("chapter1").setUpdate(date).setEvent();
 
         assertEquals(7, buffer.getVolatileParams().size());
-        assertEquals("pid", buffer.getVolatileParams().get(0).getKey());
-        assertEquals("", buffer.getVolatileParams().get(0).getValue().execute());
+        assertEquals(0, buffer.getPersistentParams().size());
+
+        assertEquals(1, buffer.getVolatileParams().get("pid").getValues().size());
+        assertEquals("", buffer.getVolatileParams().get("pid").getValues().get(0).execute());
 
-        assertEquals("pchap", buffer.getVolatileParams().get(1).getKey());
-        assertEquals("chapter1", buffer.getVolatileParams().get(1).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("pchap").getValues().size());
+        assertEquals("chapter1", buffer.getVolatileParams().get("pchap").getValues().get(0).execute());
 
-        assertEquals("pidt", buffer.getVolatileParams().get(2).getKey());
-        assertEquals(new SimpleDateFormat("yyyyMMddHHmm", Locale.getDefault()).format(date), buffer.getVolatileParams().get(2).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("pidt").getValues().size());
+        assertEquals(new SimpleDateFormat("yyyyMMddHHmm", Locale.getDefault()).format(date), buffer.getVolatileParams().get("pidt").getValues().get(0).execute());
 
-        assertEquals("type", buffer.getVolatileParams().get(3).getKey());
-        assertEquals("screen", buffer.getVolatileParams().get(3).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("screen", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("action", buffer.getVolatileParams().get(4).getKey());
-        assertEquals("view", buffer.getVolatileParams().get(4).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("action").getValues().size());
+        assertEquals("view", buffer.getVolatileParams().get("action").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(5).getKey());
-        assertEquals("name", buffer.getVolatileParams().get(5).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("name", buffer.getVolatileParams().get("p").getValues().get(0).execute());
     }
 
     @Test
     public void setEventWithChapter2Test() {
         Date date = new Date();
-        dynamicScreen.setScreenId("test").setName("toto").setChapter1("toto").setChapter2("tata").setUpdate(date).setEvent();
+        dynamicScreen.setScreenId("test").setName("name").setChapter1("chap1").setChapter2("chap2").setUpdate(date).setEvent();
 
         assertEquals(7, buffer.getVolatileParams().size());
-        assertEquals("pid", buffer.getVolatileParams().get(0).getKey());
-        assertEquals("test", buffer.getVolatileParams().get(0).getValue().execute());
+        assertEquals(0, buffer.getPersistentParams().size());
+
+        assertEquals(1, buffer.getVolatileParams().get("pid").getValues().size());
+        assertEquals("test", buffer.getVolatileParams().get("pid").getValues().get(0).execute());
+
+        assertEquals(1, buffer.getVolatileParams().get("pchap").getValues().size());
+        assertEquals("chap1::chap2", buffer.getVolatileParams().get("pchap").getValues().get(0).execute());
 
-        assertEquals("pchap", buffer.getVolatileParams().get(1).getKey());
-        assertEquals("toto::tata", buffer.getVolatileParams().get(1).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("pidt").getValues().size());
+        assertEquals(new SimpleDateFormat("yyyyMMddHHmm", Locale.getDefault()).format(date), buffer.getVolatileParams().get("pidt").getValues().get(0).execute());
 
-        assertEquals("pidt", buffer.getVolatileParams().get(2).getKey());
-        assertEquals(new SimpleDateFormat("yyyyMMddHHmm", Locale.getDefault()).format(date), buffer.getVolatileParams().get(2).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("screen", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("type", buffer.getVolatileParams().get(3).getKey());
-        assertEquals("screen", buffer.getVolatileParams().get(3).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("action").getValues().size());
+        assertEquals("view", buffer.getVolatileParams().get("action").getValues().get(0).execute());
 
-        assertEquals("action", buffer.getVolatileParams().get(4).getKey());
-        assertEquals("view", buffer.getVolatileParams().get(4).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("name", buffer.getVolatileParams().get("p").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(5).getKey());
-        assertEquals("toto", buffer.getVolatileParams().get(5).getValue().execute());
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/DynamicScreensTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/DynamicScreensTest.java
index 9e456391..b20a8d6e 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/DynamicScreensTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/DynamicScreensTest.java
@@ -29,11 +29,10 @@ of this software and associated documentation files (the "Software"), to deal
 import org.robolectric.annotation.Config;
 
 import java.util.Date;
-import java.util.Random;
 
 import static org.junit.Assert.assertEquals;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class DynamicScreensTest extends AbstractTestClass {
 
@@ -47,59 +46,25 @@ public void setUp() throws Exception {
 
     @Test
     public void addTest() {
-        Date date = new Date();
-        DynamicScreen dynamicScreen = dynamicScreens.add("8", "test", date);
+        dynamicScreens.add("1", "2", new Date());
         assertEquals(1, tracker.getBusinessObjects().size());
-        assertEquals("8", ((DynamicScreen) tracker.getBusinessObjects().get(dynamicScreen.getId())).getScreenId());
-        assertEquals("test", ((DynamicScreen) tracker.getBusinessObjects().get(dynamicScreen.getId())).getName());
-        assertEquals(date, ((DynamicScreen) tracker.getBusinessObjects().get(dynamicScreen.getId())).getUpdate());
     }
 
     @Test
     public void addTwoTest() {
-        Date date = new Date();
-        DynamicScreen dynamicScreen = dynamicScreens.add("8", "name", date, "chapter1");
+        dynamicScreens.add("1", "2", new Date(), "3");
         assertEquals(1, tracker.getBusinessObjects().size());
-        assertEquals("8", ((DynamicScreen) tracker.getBusinessObjects().get(dynamicScreen.getId())).getScreenId());
-        assertEquals("name", ((DynamicScreen) tracker.getBusinessObjects().get(dynamicScreen.getId())).getName());
-        assertEquals("chapter1", ((DynamicScreen) tracker.getBusinessObjects().get(dynamicScreen.getId())).getChapter1());
-        assertEquals(date, ((DynamicScreen) tracker.getBusinessObjects().get(dynamicScreen.getId())).getUpdate());
     }
 
     @Test
     public void addThreeTest() {
-        Date date = new Date();
-        DynamicScreen dynamicScreen = dynamicScreens.add("8", "name", date, "chapter1", "chapter2");
+        dynamicScreens.add("1", "2", new Date(), "3", "4");
         assertEquals(1, tracker.getBusinessObjects().size());
-        assertEquals("8", ((DynamicScreen) tracker.getBusinessObjects().get(dynamicScreen.getId())).getScreenId());
-        assertEquals("name", ((DynamicScreen) tracker.getBusinessObjects().get(dynamicScreen.getId())).getName());
-        assertEquals("chapter1", ((DynamicScreen) tracker.getBusinessObjects().get(dynamicScreen.getId())).getChapter1());
-        assertEquals("chapter2", ((DynamicScreen) tracker.getBusinessObjects().get(dynamicScreen.getId())).getChapter2());
-        assertEquals(date, ((DynamicScreen) tracker.getBusinessObjects().get(dynamicScreen.getId())).getUpdate());
     }
 
     @Test
     public void addFourTest() {
-        Random r = new Random();
-        String[] vals = {
-                String.valueOf(r.nextInt(500)),
-                String.valueOf(r.nextInt(500)),
-                String.valueOf(r.nextInt(500)),
-                String.valueOf(r.nextInt(500)),
-                String.valueOf(r.nextInt(500)),
-                String.valueOf(r.nextInt(500))
-        };
-        int i = 0;
-        Date date = new Date();
-        DynamicScreen dynamicScreen = dynamicScreens.add(vals[i++], vals[i++], date, vals[i++], vals[i++], vals[i]);
-        i = 0;
-
+        dynamicScreens.add("1", "2", new Date(), "3", "4", "5");
         assertEquals(1, tracker.getBusinessObjects().size());
-        assertEquals(vals[i++], ((DynamicScreen) tracker.getBusinessObjects().get(dynamicScreen.getId())).getScreenId());
-        assertEquals(vals[i++], ((DynamicScreen) tracker.getBusinessObjects().get(dynamicScreen.getId())).getName());
-        assertEquals(vals[i++], ((DynamicScreen) tracker.getBusinessObjects().get(dynamicScreen.getId())).getChapter1());
-        assertEquals(vals[i++], ((DynamicScreen) tracker.getBusinessObjects().get(dynamicScreen.getId())).getChapter2());
-        assertEquals(vals[i], ((DynamicScreen) tracker.getBusinessObjects().get(dynamicScreen.getId())).getChapter3());
-        assertEquals(date, ((DynamicScreen) tracker.getBusinessObjects().get(dynamicScreen.getId())).getUpdate());
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/EventTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/EventTest.java
index aa1e9977..4e1b09de 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/EventTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/EventTest.java
@@ -30,50 +30,54 @@ of this software and associated documentation files (the "Software"), to deal
 
 import static org.junit.Assert.assertEquals;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class EventTest extends AbstractTestClass {
 
     private Event event;
-    private Buffer buffer;
 
     @Before
     public void setUp() throws Exception {
         super.setUp();
         event = new Event(tracker);
-        buffer = tracker.getBuffer();
     }
 
     @Test
     public void setOneTest() {
         tracker = event.set("cat", "action", "page");
+
         assertEquals(4, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
+
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("cat", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("type", buffer.getVolatileParams().get(0).getKey());
-        assertEquals("cat", buffer.getVolatileParams().get(0).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("action").getValues().size());
+        assertEquals("action", buffer.getVolatileParams().get("action").getValues().get(0).execute());
 
-        assertEquals("action", buffer.getVolatileParams().get(1).getKey());
-        assertEquals("action", buffer.getVolatileParams().get(1).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("page", buffer.getVolatileParams().get("p").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(2).getKey());
-        assertEquals("page", buffer.getVolatileParams().get(2).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("stc").getValues().size());
+        assertEquals("{}", buffer.getVolatileParams().get("stc").getValues().get(0).execute());
     }
 
     @Test
     public void setTwoTest() {
         event.set("cat", "action", "page", "obj");
         assertEquals(4, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("type", buffer.getVolatileParams().get(0).getKey());
-        assertEquals("cat", buffer.getVolatileParams().get(0).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("cat", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("action", buffer.getVolatileParams().get(1).getKey());
-        assertEquals("action", buffer.getVolatileParams().get(1).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("action").getValues().size());
+        assertEquals("action", buffer.getVolatileParams().get("action").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(2).getKey());
-        assertEquals("page", buffer.getVolatileParams().get(2).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("page", buffer.getVolatileParams().get("p").getValues().get(0).execute());
 
-        assertEquals("stc", buffer.getVolatileParams().get(3).getKey());
-        assertEquals("obj", buffer.getVolatileParams().get(3).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("stc").getValues().size());
+        assertEquals("obj", buffer.getVolatileParams().get("stc").getValues().get(0).execute());
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/GestureTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/GestureTest.java
index b336c5c3..8ee3b19d 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/GestureTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/GestureTest.java
@@ -22,8 +22,6 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
-import junit.framework.Assert;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -31,7 +29,6 @@ of this software and associated documentation files (the "Software"), to deal
 import org.robolectric.annotation.Config;
 
 import java.util.HashMap;
-import java.util.Random;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -42,15 +39,11 @@ of this software and associated documentation files (the "Software"), to deal
 public class GestureTest extends AbstractTestClass {
 
     private Gesture gesture;
-    private Buffer buffer;
-    private int i = 0;
 
     @Before
     public void setUp() throws Exception {
         super.setUp();
         gesture = new Gesture(tracker);
-        buffer = tracker.getBuffer();
-        i = 0;
     }
 
     @Test
@@ -68,63 +61,44 @@ public void multiInstancesTest() {
     @Test
     public void CustomObjectsTest() {
         CustomObjects customObjects = gesture.CustomObjects();
-        Assert.assertNotNull(gesture.CustomObjects());
-        Assert.assertEquals(gesture.CustomObjects(), customObjects);
+        assertNotNull(gesture.CustomObjects());
+        assertEquals(gesture.CustomObjects(), customObjects);
     }
 
     @Test
     public void InternalSearchDeprecatedTest() {
-        int id = new Random().nextInt(500);
-        InternalSearch internalSearch = gesture.InternalSearch("test" + id, id);
-        Assert.assertNotNull(internalSearch);
-        Assert.assertEquals(gesture.InternalSearch("", 0), internalSearch);
-
-        internalSearch = gesture.InternalSearch("", 0);
-
-        Assert.assertEquals(internalSearch.getKeyword(), "test" + id);
-        Assert.assertEquals(internalSearch.getResultScreenNumber(), id);
+        InternalSearch internalSearch = gesture.InternalSearch("test", 1);
+        assertNotNull(internalSearch);
+        assertEquals(gesture.InternalSearch("", 0), internalSearch);
     }
 
     @Test
     public void InternalSearchTest() {
-        int id = new Random().nextInt(500);
-        InternalSearch internalSearch = gesture.InternalSearch("test" + id, id, id);
-        Assert.assertNotNull(internalSearch);
-        Assert.assertEquals(gesture.InternalSearch("", 0, 0), internalSearch);
-
-        internalSearch = gesture.InternalSearch("", 0, 0);
-
-        Assert.assertEquals(internalSearch.getKeyword(), "test" + id);
-        Assert.assertEquals(internalSearch.getResultScreenNumber(), id);
-        Assert.assertEquals(internalSearch.getResultPosition(), id);
-    }
-
-    @Test
-    public void setTest() {
-        assertEquals("toto", gesture.setName("toto").getName());
-        assertEquals(Gesture.Action.Download, gesture.setAction(Gesture.Action.Download).getAction());
-        assertEquals(123, gesture.setLevel2(123).getLevel2());
+        InternalSearch internalSearch = gesture.InternalSearch("test", 1, 2);
+        assertNotNull(internalSearch);
+        assertEquals(gesture.InternalSearch("", 0, 0), internalSearch);
     }
 
     @Test
     public void setEventTest() {
         gesture.setName("gesture").setAction(Gesture.Action.Exit).setChapter2("chapter2").setEvent();
         assertEquals(5, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("click", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("S", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("click").getValues().size());
+        assertEquals("S", buffer.getVolatileParams().get("click").getValues().get(0).execute());
 
-        assertEquals("type", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("click", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("click", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("action", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("S", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("action").getValues().size());
+        assertEquals("S", buffer.getVolatileParams().get("action").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("chapter2::gesture", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("chapter2::gesture", buffer.getVolatileParams().get("p").getValues().get(0).execute());
 
-        assertEquals("stc", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("{}", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("stc").getValues().size());
+        assertEquals("{}", buffer.getVolatileParams().get("stc").getValues().get(0).execute());
     }
 
     @Test
@@ -132,55 +106,48 @@ public void setEventOnlyChaptersTest() {
         gesture.setChapter1("chapter1").setChapter3("chapter3").setEvent();
 
         assertEquals(5, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("click", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("A", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("click").getValues().size());
+        assertEquals("A", buffer.getVolatileParams().get("click").getValues().get(0).execute());
 
-        assertEquals("type", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("click", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("click", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("action", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("A", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("action").getValues().size());
+        assertEquals("A", buffer.getVolatileParams().get("action").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("chapter1::chapter3::", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("chapter1::chapter3::", buffer.getVolatileParams().get("p").getValues().get(0).execute());
 
-        assertEquals("stc", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("{}", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("stc").getValues().size());
+        assertEquals("{}", buffer.getVolatileParams().get("stc").getValues().get(0).execute());
     }
 
     @Test
     public void setEventCompleteTest() {
-        Random r = new Random();
-        String[] vals = {
-                String.valueOf(r.nextInt(500)),
-                String.valueOf(r.nextInt(500)),
-                String.valueOf(r.nextInt(500)),
-                String.valueOf(r.nextInt(500))
-        };
-        int i = 0;
-        gesture.setName(vals[i++])
-                .setChapter1(vals[i++])
-                .setChapter2(vals[i++])
-                .setChapter3(vals[i]).setEvent();
+        gesture.setName("name")
+                .setChapter1("chap1")
+                .setChapter2("chap2")
+                .setChapter3("chap3").setEvent();
 
         assertEquals(5, buffer.getVolatileParams().size());
-        i = 0;
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("click", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("A", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("click").getValues().size());
+        assertEquals("A", buffer.getVolatileParams().get("click").getValues().get(0).execute());
 
-        assertEquals("type", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("click", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("click", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("action", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("A", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("action").getValues().size());
+        assertEquals("A", buffer.getVolatileParams().get("action").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(i).getKey());
-        assertEquals(vals[1] + "::" + vals[2] + "::" + vals[3] + "::" + vals[0], buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("chap1::chap2::chap3::name", buffer.getVolatileParams().get("p").getValues().get(0).execute());
 
-        assertEquals("stc", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("{}", buffer.getVolatileParams().get(i).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("stc").getValues().size());
+        assertEquals("{}", buffer.getVolatileParams().get("stc").getValues().get(0).execute());
     }
 
     @Test
@@ -190,57 +157,93 @@ public void setEventWithCustomObjects() {
         }});
         gesture.setEvent();
 
-        assertEquals(6, buffer.getVolatileParams().size());
+        assertEquals(5, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
+
 
-        assertEquals("stc", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("{\"key\":\"value\"}", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("click").getValues().size());
+        assertEquals("A", buffer.getVolatileParams().get("click").getValues().get(0).execute());
 
-        assertEquals("click", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("A", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("click", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("type", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("click", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("action").getValues().size());
+        assertEquals("A", buffer.getVolatileParams().get("action").getValues().get(0).execute());
 
-        assertEquals("action", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("A", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("chapter1::chapter3::", buffer.getVolatileParams().get("p").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("chapter1::chapter3::", buffer.getVolatileParams().get(i++).getValue().execute());
 
-        assertEquals("stc", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("{}", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(2, buffer.getVolatileParams().get("stc").getValues().size());
+        assertEquals("{\"key\":\"value\"}", buffer.getVolatileParams().get("stc").getValues().get(0).execute());
+        assertEquals("{}", buffer.getVolatileParams().get("stc").getValues().get(1).execute());
+
     }
 
     @Test
-    public void setEventWithInternalSearch() {
+    public void setEventWithInternalDeprecatedSearch() {
         gesture.setChapter1("chapter1").setChapter3("chapter3");
-        InternalSearch is = gesture.InternalSearch("searchLabel", 3);
-
-        assertNotNull(is.getId());
+        gesture.InternalSearch("searchLabel", 3);
 
         gesture.setEvent();
 
         assertEquals(7, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
+
+        assertEquals(1, buffer.getVolatileParams().get("mc").getValues().size());
+        assertEquals("searchLabel", buffer.getVolatileParams().get("mc").getValues().get(0).execute());
+
+        assertEquals(1, buffer.getVolatileParams().get("np").getValues().size());
+        assertEquals("3", buffer.getVolatileParams().get("np").getValues().get(0).execute());
+
+        assertEquals(1, buffer.getVolatileParams().get("click").getValues().size());
+        assertEquals("IS", buffer.getVolatileParams().get("click").getValues().get(0).execute());
+
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("click", buffer.getVolatileParams().get("type").getValues().get(0).execute());
+
+        assertEquals(1, buffer.getVolatileParams().get("action").getValues().size());
+        assertEquals("IS", buffer.getVolatileParams().get("action").getValues().get(0).execute());
+
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("chapter1::chapter3::", buffer.getVolatileParams().get("p").getValues().get(0).execute());
+
+        assertEquals(1, buffer.getVolatileParams().get("stc").getValues().size());
+        assertEquals("{}", buffer.getVolatileParams().get("stc").getValues().get(0).execute());
+    }
+
+    @Test
+    public void setEventWithInternalSearch() {
+        gesture.setChapter1("chapter1").setChapter3("chapter3");
+        gesture.InternalSearch("searchLabel", 3, 4);
+        gesture.setEvent();
+
+        assertEquals(8, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
+
+
+        assertEquals(1, buffer.getVolatileParams().get("mc").getValues().size());
+        assertEquals("searchLabel", buffer.getVolatileParams().get("mc").getValues().get(0).execute());
 
-        assertEquals("mc", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("searchLabel", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("np").getValues().size());
+        assertEquals("3", buffer.getVolatileParams().get("np").getValues().get(0).execute());
 
-        assertEquals("np", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("3", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("mcrg").getValues().size());
+        assertEquals("4", buffer.getVolatileParams().get("mcrg").getValues().get(0).execute());
 
-        assertEquals("click", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("IS", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("click").getValues().size());
+        assertEquals("IS", buffer.getVolatileParams().get("click").getValues().get(0).execute());
 
-        assertEquals("type", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("click", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("click", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("action", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("IS", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("action").getValues().size());
+        assertEquals("IS", buffer.getVolatileParams().get("action").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("chapter1::chapter3::", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("chapter1::chapter3::", buffer.getVolatileParams().get("p").getValues().get(0).execute());
 
-        assertEquals("stc", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("{}", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("stc").getValues().size());
+        assertEquals("{}", buffer.getVolatileParams().get("stc").getValues().get(0).execute());
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/GesturesTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/GesturesTest.java
index 44de9624..590d98ae 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/GesturesTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/GesturesTest.java
@@ -28,11 +28,9 @@ of this software and associated documentation files (the "Software"), to deal
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-import java.util.Random;
-
 import static org.junit.Assert.assertEquals;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class GesturesTest extends AbstractTestClass {
 
@@ -46,35 +44,19 @@ public void setUp() throws Exception {
 
     @Test
     public void addTest() {
-        Gesture gesture = gestures.add();
+        gestures.add();
         assertEquals(1, tracker.getBusinessObjects().size());
-        assertEquals("", ((Gesture) tracker.getBusinessObjects().get(gesture.getId())).getName());
     }
 
     @Test
     public void addWithLevel2Test() {
-        Random r = new Random();
-        String gestureName = String.valueOf(r.nextInt(500));
-        int level2 = r.nextInt(500);
-
-        Gesture gesture = gestures.add(gestureName).setLevel2(level2);
+        gestures.add("name").setLevel2(2);
         assertEquals(1, tracker.getBusinessObjects().size());
-        assertEquals(gestureName, ((Gesture) tracker.getBusinessObjects().get(gesture.getId())).getName());
-        assertEquals(level2, ((Gesture) tracker.getBusinessObjects().get(gesture.getId())).getLevel2());
     }
 
     @Test
     public void addWithChaptersTest() {
-        Random r = new Random();
-        String[] levels = {
-                String.valueOf(r.nextInt(500)),
-                String.valueOf(r.nextInt(500)),
-                String.valueOf(r.nextInt(500)),
-                String.valueOf(r.nextInt(500))
-        };
-        int i = 0;
-        Gesture gesture = gestures.add(levels[i++], levels[i++], levels[i++], levels[i]);
+        gestures.add("name", "chap1", "chap2", "chap3");
         assertEquals(1, tracker.getBusinessObjects().size());
-        assertEquals(levels[1] + "::" + levels[2] + "::" + levels[3] + "::" + levels[0], ((Gesture) tracker.getBusinessObjects().get(gesture.getId())).getName());
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/IdentifiedVisitorTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/IdentifiedVisitorTest.java
index f1cedc38..a7b41fd4 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/IdentifiedVisitorTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/IdentifiedVisitorTest.java
@@ -26,87 +26,81 @@ of this software and associated documentation files (the "Software"), to deal
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-import java.util.Random;
-
 import static org.junit.Assert.assertEquals;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class IdentifiedVisitorTest extends AbstractTestClass {
 
     private IdentifiedVisitor identifiedVisitor;
-    private Buffer buffer;
 
     @Before
     public void setUp() throws Exception {
         super.setUp();
-        Configuration configuration = tracker.getConfiguration();
-        configuration.put(TrackerConfigurationKeys.PERSIST_IDENTIFIED_VISITOR, false);
-        tracker = new Tracker(RuntimeEnvironment.application, configuration);
-        identifiedVisitor = new IdentifiedVisitor(tracker);
-        buffer = tracker.getBuffer();
+        tracker.setPersistentIdentifiedVisitorEnabled(false, null, true);
         buffer.getPersistentParams().clear();
+        identifiedVisitor = new IdentifiedVisitor(tracker);
     }
 
     @Test
     public void setOneTest() {
-        int id = new Random().nextInt(500);
-        tracker = identifiedVisitor.set(id);
+        identifiedVisitor.set(1);
         assertEquals(1, buffer.getPersistentParams().size());
-        assertEquals("an", buffer.getPersistentParams().get(0).getKey());
-        assertEquals(String.valueOf(id), buffer.getPersistentParams().get(0).getValue().execute());
+        assertEquals(0, buffer.getVolatileParams().size());
+
+        assertEquals(1, buffer.getPersistentParams().get("an").getValues().size());
+        assertEquals(String.valueOf(1), buffer.getPersistentParams().get("an").getValues().get(0).execute());
     }
 
     @Test
     public void setTwoTest() {
-        int id = new Random().nextInt(500);
-        int cat = new Random().nextInt(500);
-        tracker = identifiedVisitor.set(id, cat);
+        identifiedVisitor.set(1, 1);
         assertEquals(2, buffer.getPersistentParams().size());
-        assertEquals("an", buffer.getPersistentParams().get(0).getKey());
-        assertEquals(String.valueOf(id), buffer.getPersistentParams().get(0).getValue().execute());
+        assertEquals(0, buffer.getVolatileParams().size());
+
+        assertEquals(1, buffer.getPersistentParams().get("an").getValues().size());
+        assertEquals(String.valueOf(1), buffer.getPersistentParams().get("an").getValues().get(0).execute());
 
-        assertEquals("ac", buffer.getPersistentParams().get(1).getKey());
-        assertEquals(String.valueOf(cat), buffer.getPersistentParams().get(1).getValue().execute());
+        assertEquals(1, buffer.getPersistentParams().get("ac").getValues().size());
+        assertEquals(String.valueOf(1), buffer.getPersistentParams().get("ac").getValues().get(0).execute());
     }
 
     @Test
     public void setThreeTest() {
-        int id = new Random().nextInt(500);
-        tracker = identifiedVisitor.set("visitor" + id);
+        identifiedVisitor.set("visitor");
         assertEquals(1, buffer.getPersistentParams().size());
-        assertEquals("at", buffer.getPersistentParams().get(0).getKey());
-        assertEquals("visitor" + id, buffer.getPersistentParams().get(0).getValue().execute());
+        assertEquals(0, buffer.getVolatileParams().size());
+
+        assertEquals(1, buffer.getPersistentParams().get("at").getValues().size());
+        assertEquals("visitor", buffer.getPersistentParams().get("at").getValues().get(0).execute());
 
     }
 
     @Test
     public void setFourTest() {
-        int id = new Random().nextInt(500);
-        int cat = new Random().nextInt(500);
-        tracker = identifiedVisitor.set("visitor" + id, cat);
+        identifiedVisitor.set("visitor", 1);
+
         assertEquals(2, buffer.getPersistentParams().size());
-        assertEquals("at", buffer.getPersistentParams().get(0).getKey());
-        assertEquals("visitor" + id, buffer.getPersistentParams().get(0).getValue().execute());
+        assertEquals(0, buffer.getVolatileParams().size());
+
+        assertEquals(1, buffer.getPersistentParams().get("at").getValues().size());
+        assertEquals("visitor", buffer.getPersistentParams().get("at").getValues().get(0).execute());
 
-        assertEquals("ac", buffer.getPersistentParams().get(1).getKey());
-        assertEquals(String.valueOf(cat), buffer.getPersistentParams().get(1).getValue().execute());
+        assertEquals(1, buffer.getPersistentParams().get("ac").getValues().size());
+        assertEquals(String.valueOf(1), buffer.getPersistentParams().get("ac").getValues().get(0).execute());
     }
 
     @Test
     public void unsetTest() {
-        tracker = identifiedVisitor.set("visitor", 2);
-        assertEquals(2, buffer.getPersistentParams().size());
-        assertEquals("at", buffer.getPersistentParams().get(0).getKey());
-        assertEquals("visitor", buffer.getPersistentParams().get(0).getValue().execute());
+        identifiedVisitor.set("visitor", 1);
 
-        assertEquals("ac", buffer.getPersistentParams().get(1).getKey());
-        assertEquals("2", buffer.getPersistentParams().get(1).getValue().execute());
+        assertEquals(2, buffer.getPersistentParams().size());
+        assertEquals(0, buffer.getVolatileParams().size());
 
         identifiedVisitor.unset();
         assertEquals(0, buffer.getPersistentParams().size());
+        assertEquals(0, buffer.getVolatileParams().size());
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/InternalSearchTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/InternalSearchTest.java
index a0538eea..e37f0fcc 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/InternalSearchTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/InternalSearchTest.java
@@ -32,18 +32,16 @@ of this software and associated documentation files (the "Software"), to deal
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertNull;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class InternalSearchTest extends AbstractTestClass {
 
     private InternalSearch internalSearch;
-    private Buffer buffer;
 
     @Before
     public void setUp() throws Exception {
         super.setUp();
         internalSearch = new InternalSearch(tracker);
-        buffer = tracker.getBuffer();
     }
 
     @Test
@@ -58,35 +56,34 @@ public void multiInstancesTest() {
         assertNotSame(internalSearch, new InternalSearch(tracker));
     }
 
-    @Test
-    public void setTest() {
-        assertEquals("search", internalSearch.setKeyword("search").getKeyword());
-        assertEquals(123, internalSearch.setResultScreenNumber(123).getResultScreenNumber());
-        assertEquals(123, internalSearch.setResultPosition(123).getResultPosition());
-    }
-
     @Test
     public void setEventTest() {
         internalSearch.setKeyword("search").setResultScreenNumber(3).setEvent();
+
         assertEquals(2, buffer.getVolatileParams().size());
-        assertEquals("mc", buffer.getVolatileParams().get(0).getKey());
-        assertEquals("search", buffer.getVolatileParams().get(0).getValue().execute());
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("np", buffer.getVolatileParams().get(1).getKey());
-        assertEquals("3", buffer.getVolatileParams().get(1).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("mc").getValues().size());
+        assertEquals("search", buffer.getVolatileParams().get("mc").getValues().get(0).execute());
+
+        assertEquals(1, buffer.getVolatileParams().get("np").getValues().size());
+        assertEquals("3", buffer.getVolatileParams().get("np").getValues().get(0).execute());
     }
 
     @Test
     public void setEventTouchTest() {
         internalSearch.setKeyword("se)a..rù c^h").setResultScreenNumber(3).setResultPosition(5).setEvent();
+
         assertEquals(3, buffer.getVolatileParams().size());
-        assertEquals("mc", buffer.getVolatileParams().get(0).getKey());
-        assertEquals("search", buffer.getVolatileParams().get(0).getValue().execute());
+        assertEquals(0, buffer.getPersistentParams().size());
+
+        assertEquals(1, buffer.getVolatileParams().get("mc").getValues().size());
+        assertEquals("search", buffer.getVolatileParams().get("mc").getValues().get(0).execute());
 
-        assertEquals("np", buffer.getVolatileParams().get(1).getKey());
-        assertEquals("3", buffer.getVolatileParams().get(1).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("np").getValues().size());
+        assertEquals("3", buffer.getVolatileParams().get("np").getValues().get(0).execute());
 
-        assertEquals("mcrg", buffer.getVolatileParams().get(2).getKey());
-        assertEquals("5", buffer.getVolatileParams().get(2).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("mcrg").getValues().size());
+        assertEquals("5", buffer.getVolatileParams().get("mcrg").getValues().get(0).execute());
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/InternalSearchesTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/InternalSearchesTest.java
index 689f0172..62e519dd 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/InternalSearchesTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/InternalSearchesTest.java
@@ -28,11 +28,9 @@ of this software and associated documentation files (the "Software"), to deal
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-import java.util.Random;
-
 import static org.junit.Assert.assertEquals;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class InternalSearchesTest extends AbstractTestClass {
 
@@ -48,26 +46,11 @@ public void setUp() throws Exception {
     public void addTest() {
         InternalSearch internalSearch = internalSearches.add("search", 8);
         assertEquals(1, tracker.getBusinessObjects().size());
-        assertEquals("search", ((InternalSearch) tracker.getBusinessObjects().get(internalSearch.getId())).getKeyword());
-        assertEquals(8, ((InternalSearch) tracker.getBusinessObjects().get(internalSearch.getId())).getResultScreenNumber());
     }
 
     @Test
     public void addTouchTest() {
-        Random r = new Random();
-        int[] vals = {
-                r.nextInt(500),
-                r.nextInt(500),
-                r.nextInt(500)
-        };
-        int i = 0;
-
-        InternalSearch internalSearch = internalSearches.add("search" + vals[i++], vals[i++], vals[i]);
-        i = 0;
-
+        internalSearches.add("search", 1, 1);
         assertEquals(1, tracker.getBusinessObjects().size());
-        assertEquals("search" + vals[i++], ((InternalSearch) tracker.getBusinessObjects().get(internalSearch.getId())).getKeyword());
-        assertEquals(vals[i++], ((InternalSearch) tracker.getBusinessObjects().get(internalSearch.getId())).getResultScreenNumber());
-        assertEquals(vals[i], ((InternalSearch) tracker.getBusinessObjects().get(internalSearch.getId())).getResultPosition());
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/LiveAudioTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/LiveAudioTest.java
index 85ef0c39..e803534b 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/LiveAudioTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/LiveAudioTest.java
@@ -28,19 +28,16 @@ of this software and associated documentation files (the "Software"), to deal
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-import java.util.Random;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertNull;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class LiveAudioTest extends AbstractTestClass {
 
     private LiveAudio liveAudio;
-    private Buffer buffer;
     private MediaPlayer player;
 
     @Before
@@ -48,7 +45,6 @@ public void setUp() throws Exception {
         super.setUp();
         player = new MediaPlayer(tracker);
         liveAudio = new LiveAudio(player);
-        buffer = tracker.getBuffer();
     }
 
     @Test
@@ -68,20 +64,6 @@ public void multiInstancesTest() {
         assertNotSame(liveAudio, new LiveAudio(player));
     }
 
-    @Test
-    public void setTest() {
-        Random r = new Random();
-        boolean rBoolean = r.nextBoolean();
-        int id = r.nextInt(500);
-
-        assertEquals("name", liveAudio.setName("name").getName());
-        assertEquals("test" + id, liveAudio.setWebDomain("test" + id).getWebDomain());
-        assertEquals(RichMedia.Action.Stop, liveAudio.setAction(RichMedia.Action.Stop).getAction());
-        assertEquals(rBoolean, liveAudio.setBuffering(rBoolean).isBuffering());
-        assertEquals(rBoolean, liveAudio.setEmbedded(rBoolean).isEmbedded());
-        assertEquals(3, liveAudio.setLevel2(3).getLevel2());
-    }
-
     @Test
     public void setEventPlayTest() {
         liveAudio.setAction(RichMedia.Action.Play)
@@ -89,29 +71,30 @@ public void setEventPlayTest() {
                 .setLevel2(9)
                 .setChapter1("chapter1")
                 .setEvent();
+
         assertEquals(7, buffer.getVolatileParams().size());
-        int i = 0;
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("type", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("audio", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("audio", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("chapter1::name", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("chapter1::name", buffer.getVolatileParams().get("p").getValues().get(0).execute());
 
-        assertEquals("a", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("play", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("a").getValues().size());
+        assertEquals("play", buffer.getVolatileParams().get("a").getValues().get(0).execute());
 
-        assertEquals("m6", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("live", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m6").getValues().size());
+        assertEquals("live", buffer.getVolatileParams().get("m6").getValues().get(0).execute());
 
-        assertEquals("plyr", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("1", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("plyr").getValues().size());
+        assertEquals("1", buffer.getVolatileParams().get("plyr").getValues().get(0).execute());
 
-        assertEquals("m5", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("int", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m5").getValues().size());
+        assertEquals("int", buffer.getVolatileParams().get("m5").getValues().get(0).execute());
 
-        assertEquals("s2", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("9", buffer.getVolatileParams().get(i).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("s2").getValues().size());
+        assertEquals("9", buffer.getVolatileParams().get("s2").getValues().get(0).execute());
     }
 
     @Test
@@ -121,29 +104,30 @@ public void setEventRefreshTest() {
                 .setLevel2(9)
                 .setChapter1("chapter1")
                 .setEvent();
+
         assertEquals(7, buffer.getVolatileParams().size());
-        int i = 0;
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("type", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("audio", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("audio", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("chapter1::name", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("chapter1::name", buffer.getVolatileParams().get("p").getValues().get(0).execute());
 
-        assertEquals("a", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("refresh", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("a").getValues().size());
+        assertEquals("refresh", buffer.getVolatileParams().get("a").getValues().get(0).execute());
 
-        assertEquals("m6", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("live", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m6").getValues().size());
+        assertEquals("live", buffer.getVolatileParams().get("m6").getValues().get(0).execute());
 
-        assertEquals("plyr", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("1", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("plyr").getValues().size());
+        assertEquals("1", buffer.getVolatileParams().get("plyr").getValues().get(0).execute());
 
-        assertEquals("m5", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("int", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m5").getValues().size());
+        assertEquals("int", buffer.getVolatileParams().get("m5").getValues().get(0).execute());
 
-        assertEquals("s2", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("9", buffer.getVolatileParams().get(i).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("s2").getValues().size());
+        assertEquals("9", buffer.getVolatileParams().get("s2").getValues().get(0).execute());
     }
 
     @Test
@@ -154,28 +138,28 @@ public void setEventPauseTest() {
                 .setChapter1("chapter1")
                 .setEvent();
         assertEquals(7, buffer.getVolatileParams().size());
-        int i = 0;
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("type", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("audio", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("audio", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("chapter1::name", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("chapter1::name", buffer.getVolatileParams().get("p").getValues().get(0).execute());
 
-        assertEquals("a", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("pause", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("a").getValues().size());
+        assertEquals("pause", buffer.getVolatileParams().get("a").getValues().get(0).execute());
 
-        assertEquals("m6", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("live", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m6").getValues().size());
+        assertEquals("live", buffer.getVolatileParams().get("m6").getValues().get(0).execute());
 
-        assertEquals("plyr", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("1", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("plyr").getValues().size());
+        assertEquals("1", buffer.getVolatileParams().get("plyr").getValues().get(0).execute());
 
-        assertEquals("m5", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("int", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m5").getValues().size());
+        assertEquals("int", buffer.getVolatileParams().get("m5").getValues().get(0).execute());
 
-        assertEquals("s2", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("9", buffer.getVolatileParams().get(i).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("s2").getValues().size());
+        assertEquals("9", buffer.getVolatileParams().get("s2").getValues().get(0).execute());
     }
 
     @Test
@@ -186,27 +170,27 @@ public void setEventStopTest() {
                 .setChapter1("chapter1")
                 .setEvent();
         assertEquals(7, buffer.getVolatileParams().size());
-        int i = 0;
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("type", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("audio", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("audio", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("chapter1::name", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("chapter1::name", buffer.getVolatileParams().get("p").getValues().get(0).execute());
 
-        assertEquals("a", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("stop", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("a").getValues().size());
+        assertEquals("stop", buffer.getVolatileParams().get("a").getValues().get(0).execute());
 
-        assertEquals("m6", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("live", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m6").getValues().size());
+        assertEquals("live", buffer.getVolatileParams().get("m6").getValues().get(0).execute());
 
-        assertEquals("plyr", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("1", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("plyr").getValues().size());
+        assertEquals("1", buffer.getVolatileParams().get("plyr").getValues().get(0).execute());
 
-        assertEquals("m5", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("int", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m5").getValues().size());
+        assertEquals("int", buffer.getVolatileParams().get("m5").getValues().get(0).execute());
 
-        assertEquals("s2", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("9", buffer.getVolatileParams().get(i).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("s2").getValues().size());
+        assertEquals("9", buffer.getVolatileParams().get("s2").getValues().get(0).execute());
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/LiveVideoTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/LiveVideoTest.java
index 127e60b7..00231786 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/LiveVideoTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/LiveVideoTest.java
@@ -35,12 +35,11 @@ of this software and associated documentation files (the "Software"), to deal
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertNull;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class LiveVideoTest extends AbstractTestClass {
 
     private LiveVideo liveVideo;
-    private Buffer buffer;
     private MediaPlayer player;
 
     @Before
@@ -48,7 +47,6 @@ public void setUp() throws Exception {
         super.setUp();
         player = new MediaPlayer(tracker);
         liveVideo = new LiveVideo(player);
-        buffer = tracker.getBuffer();
     }
 
     @Test
@@ -68,145 +66,133 @@ public void multiInstancesTest() {
         assertNotSame(liveVideo, new Video(player));
     }
 
-    @Test
-    public void setTest() {
-        Random r = new Random();
-        boolean rBoolean = r.nextBoolean();
-        int id = r.nextInt(500);
-        
-        assertEquals("name", liveVideo.setName("name").getName());
-        assertEquals("test" + id, liveVideo.setWebDomain("test" + id).getWebDomain());
-        assertEquals(RichMedia.Action.Stop, liveVideo.setAction(RichMedia.Action.Stop).getAction());
-        assertEquals(rBoolean, liveVideo.setBuffering(rBoolean).isBuffering());
-        assertEquals(rBoolean, liveVideo.setEmbedded(rBoolean).isEmbedded());
-        assertEquals(3, liveVideo.setLevel2(3).getLevel2());
-    }
-
     @Test
     public void setEventPlayTest() {
         liveVideo.setAction(RichMedia.Action.Play)
                 .setName("name")
-                .setLevel2(5)
+                .setLevel2(9)
                 .setChapter1("chapter1")
                 .setEvent();
+
         assertEquals(7, buffer.getVolatileParams().size());
-        int i = 0;
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("type", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("video", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("video", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("chapter1::name", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("chapter1::name", buffer.getVolatileParams().get("p").getValues().get(0).execute());
 
-        assertEquals("a", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("play", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("a").getValues().size());
+        assertEquals("play", buffer.getVolatileParams().get("a").getValues().get(0).execute());
 
-        assertEquals("m6", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("live", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m6").getValues().size());
+        assertEquals("live", buffer.getVolatileParams().get("m6").getValues().get(0).execute());
 
-        assertEquals("plyr", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("1", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("plyr").getValues().size());
+        assertEquals("1", buffer.getVolatileParams().get("plyr").getValues().get(0).execute());
 
-        assertEquals("m5", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("int", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m5").getValues().size());
+        assertEquals("int", buffer.getVolatileParams().get("m5").getValues().get(0).execute());
 
-        assertEquals("s2", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("5", buffer.getVolatileParams().get(i).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("s2").getValues().size());
+        assertEquals("9", buffer.getVolatileParams().get("s2").getValues().get(0).execute());
     }
 
     @Test
     public void setEventRefreshTest() {
         liveVideo.setAction(RichMedia.Action.Refresh)
                 .setName("name")
-                .setLevel2(5)
+                .setLevel2(9)
                 .setChapter1("chapter1")
                 .setEvent();
+
         assertEquals(7, buffer.getVolatileParams().size());
-        int i = 0;
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("type", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("video", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("video", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("chapter1::name", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("chapter1::name", buffer.getVolatileParams().get("p").getValues().get(0).execute());
 
-        assertEquals("a", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("refresh", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("a").getValues().size());
+        assertEquals("refresh", buffer.getVolatileParams().get("a").getValues().get(0).execute());
 
-        assertEquals("m6", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("live", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m6").getValues().size());
+        assertEquals("live", buffer.getVolatileParams().get("m6").getValues().get(0).execute());
 
-        assertEquals("plyr", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("1", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("plyr").getValues().size());
+        assertEquals("1", buffer.getVolatileParams().get("plyr").getValues().get(0).execute());
 
-        assertEquals("m5", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("int", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m5").getValues().size());
+        assertEquals("int", buffer.getVolatileParams().get("m5").getValues().get(0).execute());
 
-        assertEquals("s2", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("5", buffer.getVolatileParams().get(i).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("s2").getValues().size());
+        assertEquals("9", buffer.getVolatileParams().get("s2").getValues().get(0).execute());
     }
 
     @Test
     public void setEventPauseTest() {
         liveVideo.setAction(RichMedia.Action.Pause)
                 .setName("name")
-                .setLevel2(5)
+                .setLevel2(9)
                 .setChapter1("chapter1")
                 .setEvent();
         assertEquals(7, buffer.getVolatileParams().size());
-        int i = 0;
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("type", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("video", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("video", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("chapter1::name", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("chapter1::name", buffer.getVolatileParams().get("p").getValues().get(0).execute());
 
-        assertEquals("a", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("pause", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("a").getValues().size());
+        assertEquals("pause", buffer.getVolatileParams().get("a").getValues().get(0).execute());
 
-        assertEquals("m6", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("live", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m6").getValues().size());
+        assertEquals("live", buffer.getVolatileParams().get("m6").getValues().get(0).execute());
 
-        assertEquals("plyr", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("1", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("plyr").getValues().size());
+        assertEquals("1", buffer.getVolatileParams().get("plyr").getValues().get(0).execute());
 
-        assertEquals("m5", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("int", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m5").getValues().size());
+        assertEquals("int", buffer.getVolatileParams().get("m5").getValues().get(0).execute());
 
-        assertEquals("s2", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("5", buffer.getVolatileParams().get(i).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("s2").getValues().size());
+        assertEquals("9", buffer.getVolatileParams().get("s2").getValues().get(0).execute());
     }
 
     @Test
     public void setEventStopTest() {
         liveVideo.setAction(RichMedia.Action.Stop)
                 .setName("name")
-                .setLevel2(5)
+                .setLevel2(9)
                 .setChapter1("chapter1")
                 .setEvent();
         assertEquals(7, buffer.getVolatileParams().size());
-        int i = 0;
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("type", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("video", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("video", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("chapter1::name", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("chapter1::name", buffer.getVolatileParams().get("p").getValues().get(0).execute());
 
-        assertEquals("a", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("stop", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("a").getValues().size());
+        assertEquals("stop", buffer.getVolatileParams().get("a").getValues().get(0).execute());
 
-        assertEquals("m6", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("live", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m6").getValues().size());
+        assertEquals("live", buffer.getVolatileParams().get("m6").getValues().get(0).execute());
 
-        assertEquals("plyr", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("1", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("plyr").getValues().size());
+        assertEquals("1", buffer.getVolatileParams().get("plyr").getValues().get(0).execute());
 
-        assertEquals("m5", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("int", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m5").getValues().size());
+        assertEquals("int", buffer.getVolatileParams().get("m5").getValues().get(0).execute());
 
-        assertEquals("s2", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("5", buffer.getVolatileParams().get(i).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("s2").getValues().size());
+        assertEquals("9", buffer.getVolatileParams().get("s2").getValues().get(0).execute());
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/LiveVideosTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/LiveVideosTest.java
index 8088d0b2..3f4fb3db 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/LiveVideosTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/LiveVideosTest.java
@@ -35,7 +35,7 @@ of this software and associated documentation files (the "Software"), to deal
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class LiveVideosTest extends AbstractTestClass {
 
@@ -57,46 +57,24 @@ public void initTest() {
     public void addOneTest() {
         liveVideos.add("name");
         assertEquals(1, liveVideos.list.size());
-        assertEquals("name", liveVideos.list.get(0).getName());
     }
 
     @Test
     public void addTwoTest() {
         liveVideos.add("name", "chapter1");
         assertEquals(1, liveVideos.list.size());
-        assertEquals("name", liveVideos.list.get(0).getName());
-        assertEquals("chapter1", liveVideos.list.get(0).getChapter1());
     }
 
     @Test
     public void addThreeTest() {
         liveVideos.add("name", "chapter1", "chapter2");
         assertEquals(1, liveVideos.list.size());
-        assertEquals("name", liveVideos.list.get(0).getName());
-        assertEquals("chapter1", liveVideos.list.get(0).getChapter1());
-        assertEquals("chapter2", liveVideos.list.get(0).getChapter2());
     }
 
     @Test
     public void addFourTest() {
-        Random r = new Random();
-        String[] levels = {
-                String.valueOf(r.nextInt(500)),
-                String.valueOf(r.nextInt(500)),
-                String.valueOf(r.nextInt(500)),
-                String.valueOf(r.nextInt(500))
-        };
-        int i = 0;
-        LiveVideo lv = liveVideos.add(levels[i++], levels[i++], levels[i++], levels[i]);
-
-        assertNotNull(lv.getId());
-        i = 0;
-
+        liveVideos.add("name", "chapter1", "chapter2", "chapter3");
         assertEquals(1, liveVideos.list.size());
-        assertEquals(levels[i++], liveVideos.list.get(0).getName());
-        assertEquals(levels[i++], liveVideos.list.get(0).getChapter1());
-        assertEquals(levels[i++], liveVideos.list.get(0).getChapter2());
-        assertEquals(levels[i], liveVideos.list.get(0).getChapter3());
     }
 
     @Test
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/LocationTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/LocationTest.java
index c159f5d9..8eebea02 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/LocationTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/LocationTest.java
@@ -30,18 +30,16 @@ of this software and associated documentation files (the "Software"), to deal
 
 import static org.junit.Assert.assertEquals;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class LocationTest extends AbstractTestClass {
 
     private Location location;
-    private Buffer buffer;
 
     @Before
     public void setUp() throws Exception {
         super.setUp();
         location = new Location(tracker);
-        buffer = tracker.getBuffer();
     }
 
     @Test
@@ -50,22 +48,17 @@ public void initTest() {
         assertEquals(-1., location.getLongitude(), 0.1);
     }
 
-    @Test
-    public void setTest() {
-        assertEquals(5., location.setLatitude(5.).getLatitude(), 0.1);
-        assertEquals(6., location.setLongitude(6.).getLongitude(), 0.1);
-    }
-
     @Test
     public void setEventTest() {
         location.setLatitude(87876576.87787).setLongitude(3786765.915656).setEvent();
 
         assertEquals(2, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("gy", buffer.getVolatileParams().get(0).getKey());
-        assertEquals("87876576.88", buffer.getVolatileParams().get(0).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("gy").getValues().size());
+        assertEquals("87876576.88", buffer.getVolatileParams().get("gy").getValues().get(0).execute());
 
-        assertEquals("gx", buffer.getVolatileParams().get(1).getKey());
-        assertEquals("3786765.92", buffer.getVolatileParams().get(1).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("gx").getValues().size());
+        assertEquals("3786765.92", buffer.getVolatileParams().get("gx").getValues().get(0).execute());
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/LocationsTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/LocationsTest.java
index 11963249..87b2c4af 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/LocationsTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/LocationsTest.java
@@ -46,12 +46,7 @@ public void setUp() throws Exception {
 
     @Test
     public void addTest() {
-        Random r = new Random();
-        double lat = r.nextInt(500);
-        double lon = r.nextInt(500);
-        Location location = locations.add(lat, lon);
+        locations.add(1, 1);
         assertEquals(1, tracker.getBusinessObjects().size());
-        assertEquals(lat, ((Location) tracker.getBusinessObjects().get(location.getId())).getLatitude(), 0);
-        assertEquals(lon, ((Location) tracker.getBusinessObjects().get(location.getId())).getLongitude(), 0);
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/MediaPlayerTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/MediaPlayerTest.java
index d9533dca..14a66559 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/MediaPlayerTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/MediaPlayerTest.java
@@ -33,7 +33,7 @@ of this software and associated documentation files (the "Software"), to deal
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertSame;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class MediaPlayerTest extends AbstractTestClass {
 
@@ -82,9 +82,4 @@ public void getLiveAudiosTest() {
         assertNotNull(mediaPlayer.LiveAudios());
         assertSame(liveAudios, mediaPlayer.LiveAudios());
     }
-
-    @Test
-    public void setTest() {
-        assertEquals(123, mediaPlayer.setPlayerId(123).getPlayerId());
-    }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/NuggAdTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/NuggAdTest.java
index 010b04db..80eb5bb3 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/NuggAdTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/NuggAdTest.java
@@ -28,26 +28,26 @@ of this software and associated documentation files (the "Software"), to deal
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
+import java.util.ArrayList;
+
 import static org.junit.Assert.assertEquals;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class NuggAdTest extends AbstractTestClass {
 
     private NuggAd nuggAd;
-    private Buffer buffer;
 
     @Before
     public void setUp() throws Exception {
         super.setUp();
-        Configuration configuration = tracker.getConfiguration();
-        configuration.put("plugins", "nuggad");
-        tracker = new Tracker(RuntimeEnvironment.application, configuration);
+        tracker.setPlugins(new ArrayList<Tracker.PluginKey>() {{
+            add(Tracker.PluginKey.nuggad);
+        }}, null, true);
+        buffer.getPersistentParams().clear();
         nuggAd = new NuggAd(tracker);
-        buffer = tracker.getBuffer();
     }
 
     @Test
@@ -55,21 +55,16 @@ public void initTest() {
         assertEquals("{}", nuggAd.getNuggAdData().toString());
     }
 
-    @Test
-    public void setTest() throws JSONException {
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("nuggad", new JSONObject().put("key", "value"));
-        assertEquals(jsonObject, nuggAd.setNuggAdData(jsonObject).getNuggAdData());
-    }
-
     @Test
     public void setEventTest() throws JSONException {
         JSONObject jsonObject = new JSONObject().put("key", "value");
         nuggAd.setNuggAdData(jsonObject).setEvent();
 
         assertEquals(1, buffer.getVolatileParams().size());
-        assertEquals("stc", buffer.getVolatileParams().get(0).getKey());
-        assertEquals(new JSONObject().put("nuggad", jsonObject).toString(), buffer.getVolatileParams().get(0).getValue().execute());
+        assertEquals(0, buffer.getPersistentParams().size());
+
+        assertEquals(1, buffer.getVolatileParams().get("stc").getValues().size());
+        assertEquals(new JSONObject().put("nuggad", jsonObject).toString(), buffer.getVolatileParams().get("stc").getValues().get(0).execute());
     }
 
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/NuggAdsTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/NuggAdsTest.java
index db48400f..72a56a72 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/NuggAdsTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/NuggAdsTest.java
@@ -31,7 +31,7 @@ of this software and associated documentation files (the "Software"), to deal
 
 import static org.junit.Assert.assertEquals;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class NuggAdsTest extends AbstractTestClass {
 
@@ -45,8 +45,7 @@ public void setUp() throws Exception {
 
     @Test
     public void addTest() {
-        NuggAd nuggAd = nuggAds.add(new JSONObject());
+        nuggAds.add(new JSONObject());
         assertEquals(1, tracker.getBusinessObjects().size());
-        assertEquals("{}", ((NuggAd) tracker.getBusinessObjects().get(nuggAd.getId())).getNuggAdData().toString());
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/OrderAmountTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/OrderAmountTest.java
index f0a6c7bc..d8cda73a 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/OrderAmountTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/OrderAmountTest.java
@@ -48,17 +48,4 @@ public void initTest() {
         assertEquals(-1, orderAmount.getAmountTaxIncluded(), 0);
         assertEquals(-1, orderAmount.getTaxAmount(), 0);
     }
-
-    @Test
-    public void setTest() {
-        orderAmount.set(123, 456, 789);
-        assertEquals(123, orderAmount.getAmountTaxFree(), 0);
-        assertEquals(456, orderAmount.getAmountTaxIncluded(), 0);
-        assertEquals(789, orderAmount.getTaxAmount(), 0);
-
-        orderAmount = orderAmount.setAmountTaxFree(123).setAmountTaxIncluded(456).setTaxAmount(789);
-        assertEquals(123, orderAmount.getAmountTaxFree(), 0);
-        assertEquals(456, orderAmount.getAmountTaxIncluded(), 0);
-        assertEquals(789, orderAmount.getTaxAmount(), 0);
-    }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/OrderCustomVarsTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/OrderCustomVarsTest.java
index 5231d5c4..feffb1cb 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/OrderCustomVarsTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/OrderCustomVarsTest.java
@@ -28,11 +28,9 @@ of this software and associated documentation files (the "Software"), to deal
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-import java.util.Random;
-
 import static org.junit.Assert.assertEquals;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class OrderCustomVarsTest extends AbstractTestClass {
 
@@ -46,12 +44,7 @@ public void setUp() throws Exception {
 
     @Test
     public void addTest() {
-        int id = new Random().nextInt(500);
-        orderCustomVars = orderCustomVars.add(id, "test" + id);
-
+        orderCustomVars = orderCustomVars.add(1, "test");
         assertEquals(1, orderCustomVars.size());
-
-        assertEquals(id, orderCustomVars.get(0).getVarId());
-        assertEquals("test" + id, orderCustomVars.get(0).getValue());
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/OrderDeliveryTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/OrderDeliveryTest.java
index 74f61e34..bde7fbe5 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/OrderDeliveryTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/OrderDeliveryTest.java
@@ -28,10 +28,7 @@ of this software and associated documentation files (the "Software"), to deal
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-import java.util.Random;
-
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
 @Config(sdk =21)
@@ -52,27 +49,4 @@ public void initTest() {
         assertEquals(-1, orderDelivery.getShippingFeesTaxIncluded(), 0);
         assertNull(orderDelivery.getDeliveryMethod());
     }
-
-    @Test
-    public void setTest() {
-        Random r = new Random();
-        int[] vals = {
-                r.nextInt(500),
-                r.nextInt(500),
-                r.nextInt(500)
-        };
-        int i = 0;
-        Order o = orderDelivery.set(vals[i++], vals[i++], String.valueOf(vals[i]));
-        assertNotNull(o.getId());
-        i = 0;
-        
-        assertEquals(vals[i++], orderDelivery.getShippingFeesTaxFree(), 0);
-        assertEquals(vals[i++], orderDelivery.getShippingFeesTaxIncluded(), 0);
-        assertEquals(String.valueOf(vals[i]), orderDelivery.getDeliveryMethod());
-
-        orderDelivery = orderDelivery.setDeliveryMethod("6").setShippingFeesTaxFree(6).setShippingFeesTaxIncluded(6);
-        assertEquals(6, orderDelivery.getShippingFeesTaxFree(), 0);
-        assertEquals(6, orderDelivery.getShippingFeesTaxIncluded(), 0);
-        assertEquals("6", orderDelivery.getDeliveryMethod());
-    }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/OrderDiscountTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/OrderDiscountTest.java
index 5a9aeabf..6f60e4cb 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/OrderDiscountTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/OrderDiscountTest.java
@@ -28,10 +28,7 @@ of this software and associated documentation files (the "Software"), to deal
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-import java.util.Random;
-
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
 @Config(sdk =21)
@@ -52,27 +49,4 @@ public void initTest() {
         assertEquals(-1, orderDiscount.getDiscountTaxFree(), 0);
         assertEquals(-1, orderDiscount.getDiscountTaxIncluded(), 0);
     }
-
-    @Test
-    public void setTest() {
-        Random r = new Random();
-        int[] vals = {
-                r.nextInt(500),
-                r.nextInt(500),
-                r.nextInt(500)
-        };
-        int i = 0;
-        Order o = orderDiscount.set(vals[i++], vals[i++], String.valueOf(vals[i]));
-        assertNotNull(o.getId());
-        i = 0;
-
-        assertEquals(vals[i++], orderDiscount.getDiscountTaxFree(), 0);
-        assertEquals(vals[i++], orderDiscount.getDiscountTaxIncluded(), 0);
-        assertEquals(String.valueOf(vals[i]), orderDiscount.getPromotionalCode());
-
-        orderDiscount = orderDiscount.setDiscountTaxFree(1).setDiscountTaxIncluded(1).setPromotionalCode("p");
-        assertEquals(1, orderDiscount.getDiscountTaxFree(), 0);
-        assertEquals(1, orderDiscount.getDiscountTaxIncluded(), 0);
-        assertEquals("p", orderDiscount.getPromotionalCode());
-    }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/OrderTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/OrderTest.java
index 2a3e2ba8..5fa31bdc 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/OrderTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/OrderTest.java
@@ -34,18 +34,16 @@ of this software and associated documentation files (the "Software"), to deal
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertNull;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class OrderTest extends AbstractTestClass {
 
     private Order order;
-    private Buffer buffer;
 
     @Before
     public void setUp() throws Exception {
         super.setUp();
         order = new Order(tracker);
-        buffer = tracker.getBuffer();
     }
 
     @Test
@@ -85,35 +83,30 @@ public void getDeliveryTest() {
         assertEquals(orderDelivery, order.Delivery());
     }
 
-    @Test
-    public void setTest() {
-        assertEquals("orderID", order.setOrderId("orderID").getOrderId());
-        assertEquals(123.321, order.setTurnover(123.321).getTurnover(),0);
-        assertEquals(123, order.setStatus(123).getStatus());
-    }
-
     @Test
     public void setEventTest() {
         order.Amount().set(34.6, 6.7, 8).CustomVars().add(4, "test");
         order.setEvent();
+
         assertEquals(6, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("cmd", buffer.getVolatileParams().get(0).getKey());
-        assertEquals("", buffer.getVolatileParams().get(0).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("cmd").getValues().size());
+        assertEquals("", buffer.getVolatileParams().get("cmd").getValues().get(0).execute());
 
-        assertEquals("newcus", buffer.getVolatileParams().get(1).getKey());
-        assertEquals("0", buffer.getVolatileParams().get(1).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("newcus").getValues().size());
+        assertEquals("0", buffer.getVolatileParams().get("newcus").getValues().get(0).execute());
 
-        assertEquals("mtht", buffer.getVolatileParams().get(2).getKey());
-        assertEquals("34.6", buffer.getVolatileParams().get(2).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("mtht").getValues().size());
+        assertEquals("34.6", buffer.getVolatileParams().get("mtht").getValues().get(0).execute());
 
-        assertEquals("mtttc", buffer.getVolatileParams().get(3).getKey());
-        assertEquals("6.7", buffer.getVolatileParams().get(3).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("mtttc").getValues().size());
+        assertEquals("6.7", buffer.getVolatileParams().get("mtttc").getValues().get(0).execute());
 
-        assertEquals("tax", buffer.getVolatileParams().get(4).getKey());
-        assertEquals("8.0", buffer.getVolatileParams().get(4).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("tax").getValues().size());
+        assertEquals("8.0", buffer.getVolatileParams().get("tax").getValues().get(0).execute());
 
-        assertEquals("o4", buffer.getVolatileParams().get(5).getKey());
-        assertEquals("test", buffer.getVolatileParams().get(5).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("o4").getValues().size());
+        assertEquals("test", buffer.getVolatileParams().get("o4").getValues().get(0).execute());
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/OrdersTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/OrdersTest.java
index a1b5d965..d11ebb33 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/OrdersTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/OrdersTest.java
@@ -33,7 +33,7 @@ of this software and associated documentation files (the "Software"), to deal
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class OrdersTest extends AbstractTestClass {
 
@@ -47,29 +47,13 @@ public void setUp() throws Exception {
 
     @Test
     public void addOneTest() {
-        Order order = orders.add("orderID", 78.0);
+        orders.add("orderID", 78.0);
         assertEquals(1, tracker.getBusinessObjects().size());
-        assertEquals("orderID", ((Order) tracker.getBusinessObjects().get(order.getId())).getOrderId());
-        assertEquals(78.0, ((Order) tracker.getBusinessObjects().get(order.getId())).getTurnover(), 0);
     }
 
     @Test
     public void addTwoTest() {
-        Random r = new Random();
-        int[] vals = {
-                r.nextInt(500),
-                r.nextInt(500),
-                r.nextInt(500)
-        };
-        int i = 0;
-
-        Order order = orders.add("order" + vals[i++], (double) vals[i++], vals[i]);
+        orders.add("orderId", 1., 2);
         assertEquals(1, tracker.getBusinessObjects().size());
-        i = 0;
-
-        assertEquals("order" + vals[i++], ((Order) tracker.getBusinessObjects().get(order.getId())).getOrderId());
-        assertEquals((double) vals[i++], ((Order) tracker.getBusinessObjects().get(order.getId())).getTurnover(), 0);
-        assertEquals(vals[i], ((Order) tracker.getBusinessObjects().get(order.getId())).getStatus());
-        assertSame(order, tracker.getBusinessObjects().get(order.getId()));
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ParamOptionTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ParamOptionTest.java
deleted file mode 100644
index a9d13a46..00000000
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ParamOptionTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-This SDK is licensed under the MIT license (MIT)
-Copyright (c) 2015- Applied Technologies Internet SAS (registration number B 403 261 258 - Trade and Companies Register of Bordeaux – France)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
- */
-package com.atinternet.tracker;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-
-import java.util.Random;
-
-import static com.atinternet.tracker.ParamOption.RelativePosition.last;
-import static com.atinternet.tracker.ParamOption.RelativePosition.none;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-@Config(sdk =21)
-@RunWith(RobolectricTestRunner.class)
-public class ParamOptionTest extends AbstractTestClass {
-
-    private final ParamOption options = new ParamOption();
-
-    @Test
-    public void defaultParameterOption() {
-        assertEquals(none, options.getRelativePosition());
-        assertEquals("", options.getRelativeParameterKey());
-        assertEquals(",", options.getSeparator());
-        assertFalse(options.isEncode());
-        assertFalse(options.isPersistent());
-        assertFalse(options.isAppend());
-    }
-
-    @Test
-    public void setEncodeTest() {
-        options.setEncode(true);
-        assertTrue(options.isEncode());
-    }
-
-    @Test
-    public void setPermanentTest() {
-        boolean rBoolean = new Random().nextBoolean();
-        assertFalse(options.isPersistent());
-        options.setPersistent(rBoolean);
-        assertEquals(rBoolean, options.isPersistent());
-    }
-
-    @Test
-    public void setRelativeParameterKeyTest() {
-        options.setRelativeParameterKey("p");
-        assertEquals("p", options.getRelativeParameterKey());
-    }
-
-    @Test
-    public void setRelativePositionTest() {
-        options.setRelativePosition(last);
-        assertEquals(last, options.getRelativePosition());
-    }
-
-    @Test
-    public void setSeparatorTest() {
-        options.setSeparator("::");
-        assertEquals("::", options.getSeparator());
-    }
-
-    @Test
-    public void setAppendTest() {
-        boolean rBoolean = new Random().nextBoolean();
-        options.setAppend(rBoolean);
-        assertEquals(rBoolean, options.isAppend());
-    }
-}
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ParamTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ParamTest.java
deleted file mode 100644
index e3851df9..00000000
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ParamTest.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
-This SDK is licensed under the MIT license (MIT)
-Copyright (c) 2015- Applied Technologies Internet SAS (registration number B 403 261 258 - Trade and Companies Register of Bordeaux – France)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
- */
-package com.atinternet.tracker;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-
-import java.util.Random;
-
-import static org.junit.Assert.*;
-
-@Config(sdk =21)
-@RunWith(RobolectricTestRunner.class)
-public class ParamTest extends AbstractTestClass {
-
-    private Closure value;
-
-    @Before
-    public void setUp() throws Exception {
-        super.setUp();
-        value = new Closure() {
-            @Override
-            public String execute() {
-                return "value";
-            }
-        };
-    }
-
-    @Test
-    public void multiInstanceTest() {
-        Param defaultParam = new Param();
-        assertNotSame(defaultParam, new Param("crash", value, Param.Type.Array));
-    }
-
-    // On vérifie l\'initialisation des variables membres
-    @Test
-    public void defaultParameterTest() {
-        Param defaultParam = new Param();
-        assertEquals("", defaultParam.getKey());
-        assertNull(defaultParam.getValue());
-        assertNull(defaultParam.getOptions());
-        assertEquals(Param.Type.Unknown, defaultParam.getType());
-    }
-
-    // On vérifie la creation paramétrée
-    @Test
-    public void parameterWithKeyValueTest() {
-        int id = new Random().nextInt(500);
-        Param param = new Param("key" + id, value, Param.Type.Array);
-
-        assertEquals("key" + id, param.getKey());
-        assertEquals("value", param.getValue().execute());
-        assertEquals(Param.Type.Array, param.getType());
-
-    }
-
-    // On vérifie la creation paramétrée
-    @Test
-    public void parameterWithKeyValueNotEncodeOptionsTest() {
-        ParamOption options = new ParamOption().setEncode(false);
-        Param param = new Param("key", value, Param.Type.Array, options);
-
-        assertFalse(param.getOptions().isEncode());
-    }
-
-    @Test
-    public void parameterWithKeyValuePersistentOptionsTest() {
-        ParamOption options = new ParamOption()
-                .setPersistent(true);
-        Param param = new Param("key", value, Param.Type.Array, options);
-
-        assertTrue(param.getOptions().isPersistent());
-    }
-
-    @Test
-    public void parameterWithKeyValueSeparatorOptionsTest() {
-        ParamOption options = new ParamOption()
-                .setSeparator("::");
-        Param param = new Param("key", value, Param.Type.Array, options);
-
-        assertEquals("::", param.getOptions().getSeparator());
-    }
-
-    @Test
-    public void parameterWithKeyValueRelativePositionFirstOptionsTest() {
-        ParamOption options = new ParamOption();
-        options.setRelativePosition(ParamOption.RelativePosition.first);
-        Param param = new Param("key", value, Param.Type.Array, options);
-
-        assertEquals(ParamOption.RelativePosition.first, param.getOptions().getRelativePosition());
-        assertEquals("", param.getOptions().getRelativeParameterKey());
-    }
-
-    @Test
-    public void parameterWithKeyValueRelativePositionLastOptionsTest() {
-        ParamOption options = new ParamOption()
-                .setRelativePosition(ParamOption.RelativePosition.last);
-        Param param = new Param("key", value, Param.Type.Array, options);
-
-        assertEquals(ParamOption.RelativePosition.last, param.getOptions().getRelativePosition());
-        assertEquals("", param.getOptions().getRelativeParameterKey());
-    }
-
-    @Test
-    public void parameterWithKeyValueRelativePositionBeforeOptionsTest() {
-        ParamOption options = new ParamOption()
-                .setRelativePosition(ParamOption.RelativePosition.before)
-                .setRelativeParameterKey("stc");
-        Param param = new Param("key", value, Param.Type.Array, options);
-
-        assertEquals(ParamOption.RelativePosition.before, param.getOptions().getRelativePosition());
-        assertEquals("stc", param.getOptions().getRelativeParameterKey());
-    }
-
-    @Test
-    public void parameterWithKeyValueRelativePositionAfterOptionsTest() {
-        ParamOption options = new ParamOption()
-                .setRelativePosition(ParamOption.RelativePosition.after)
-                .setRelativeParameterKey("stc");
-        Param param = new Param("key", value, Param.Type.Array, options);
-
-        assertEquals(ParamOption.RelativePosition.after, param.getOptions().getRelativePosition());
-        assertEquals("stc", param.getOptions().getRelativeParameterKey());
-    }
-
-    @Test
-    public void setKeyTest() {
-        int id = new Random().nextInt(500);
-
-        Param param = new Param();
-        param.setKey("key" + id);
-        assertEquals("key" + id, param.getKey());
-    }
-
-    @Test
-    public void setValueTest() {
-        Param param = new Param();
-        param.setValue(new Closure() {
-            @Override
-            public String execute() {
-                return "Value";
-            }
-        });
-        assertEquals("Value", param.getValue().execute());
-    }
-
-    @Test
-    public void setTypeTest() {
-        Param p = new Param();
-        p.setType(Param.Type.Array);
-        assertEquals(Param.Type.Array, p.getType());
-    }
-}
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/PluginParamTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/PluginParamTest.java
index 276bc86a..a45a1426 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/PluginParamTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/PluginParamTest.java
@@ -28,20 +28,21 @@ of this software and associated documentation files (the "Software"), to deal
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 
 import static org.junit.Assert.assertEquals;
 
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class PluginParamTest extends AbstractTestClass {
 
     @Test
     public void getPluginsDictionaryTest() {
-        Configuration configuration = tracker.getConfiguration();
-        configuration.put("plugins", "tvtracking");
-        tracker = new Tracker(RuntimeEnvironment.application, configuration);
+        tracker.setPlugins(new ArrayList<Tracker.PluginKey>() {{
+            add(Tracker.PluginKey.tvtracking);
+        }}, null, true);
 
         HashMap<String, String> plugins = PluginParam.get(tracker);
         assertEquals(1, plugins.size());
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ProductTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ProductTest.java
index 046d3c88..34d13bd4 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ProductTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ProductTest.java
@@ -30,24 +30,19 @@ of this software and associated documentation files (the "Software"), to deal
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-import java.util.Random;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class ProductTest extends AbstractTestClass {
 
     private Product product;
-    private Buffer buffer;
 
     @Before
     public void setUp() throws Exception {
         super.setUp();
         product = new Product(tracker);
-        buffer = tracker.getBuffer();
     }
 
     @Test
@@ -68,74 +63,55 @@ public void CustomObjectsTest() {
         Assert.assertEquals(product.CustomObjects(), customObjects);
     }
 
-    @Test
-    public void setTest() {
-        Random r = new Random();
-        String[] vals = {
-                String.valueOf(r.nextInt(500)),
-                String.valueOf(r.nextInt(500)),
-                String.valueOf(r.nextInt(500)),
-                String.valueOf(r.nextInt(500)),
-                String.valueOf(r.nextInt(500)),
-                String.valueOf(r.nextInt(500)),
-                String.valueOf(r.nextInt(500))
-        };
-        int i = 0;
-
-        assertEquals("pid" + vals[i], product.setProductId("pid" + vals[i++]).getProductId());
-        assertEquals(vals[i], product.setCategory1(vals[i++]).getCategory1());
-        assertEquals(vals[i], product.setCategory2(vals[i++]).getCategory2());
-        assertEquals(vals[i], product.setCategory3(vals[i++]).getCategory3());
-        assertEquals(vals[i], product.setCategory4(vals[i++]).getCategory4());
-        assertEquals(vals[i], product.setCategory5(vals[i++]).getCategory5());
-        assertEquals(vals[i], product.setCategory6(vals[i]).getCategory6());
-        assertEquals(Product.Action.View, product.setAction(Product.Action.View).getAction());
-        assertNull(product.setAction(null).getAction());
-
-        int[] others = {
-                r.nextInt(500),
-                r.nextInt(500),
-                r.nextInt(500),
-                r.nextInt(500),
-                r.nextInt(500),
-                r.nextInt(500),
-                r.nextInt(500)
-        };
-        i = 0;
-        assertEquals(others[i], product.setQuantity(others[i++]).getQuantity());
-        assertEquals(others[i], product.setUnitPriceTaxIncluded(others[i++]).getUnitPriceTaxIncluded(), 0);
-        assertEquals(others[i], product.setUnitPriceTaxFree(others[i++]).getUnitPriceTaxFree(), 0);
-        assertEquals(others[i], product.setDiscountTaxIncluded(others[i++]).getDiscountTaxIncluded(), 0);
-        assertEquals(others[i], product.setDiscountTaxFree(others[i++]).getDiscountTaxFree(), 0);
-        assertEquals(String.valueOf(others[i]), product.setPromotionalCode(String.valueOf(others[i])).getPromotionalCode());
-
-    }
-
     @Test
     public void setEventTest() {
         product.setProductId("pdtID").setCategory4("cat4").setEvent();
+
         assertEquals(2, buffer.getVolatileParams().size());
-        assertEquals("type", buffer.getVolatileParams().get(0).getKey());
-        assertEquals("pdt", buffer.getVolatileParams().get(0).getValue().execute());
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("pdtl", buffer.getVolatileParams().get(1).getKey());
-        assertEquals("cat4::pdtID", buffer.getVolatileParams().get(1).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("pdt", buffer.getVolatileParams().get("type").getValues().get(0).execute());
+
+        assertEquals(1, buffer.getVolatileParams().get("pdtl").getValues().size());
+        assertEquals("cat4::pdtID", buffer.getVolatileParams().get("pdtl").getValues().get(0).execute());
     }
 
     @Test
     public void setEventWithCOTest() {
         product.setProductId("pdtID").CustomObjects().add("{}");
         product.setEvent();
+
         assertEquals(3, buffer.getVolatileParams().size());
-        assertEquals("type", buffer.getVolatileParams().get(0).getKey());
-        assertEquals("pdt", buffer.getVolatileParams().get(0).getValue().execute());
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("stc", buffer.getVolatileParams().get(1).getKey());
-        assertEquals("{}", buffer.getVolatileParams().get(1).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("pdt", buffer.getVolatileParams().get("type").getValues().get(0).execute());
+
+        assertEquals(1, buffer.getVolatileParams().get("stc").getValues().size());
+        assertEquals("{}", buffer.getVolatileParams().get("stc").getValues().get(0).execute());
+
+        assertEquals(1, buffer.getVolatileParams().get("pdtl").getValues().size());
+        assertEquals("pdtID", buffer.getVolatileParams().get("pdtl").getValues().get(0).execute());
+
+    }
+
+    @Test
+    public void multiplesValuesTest() {
+        new Product(tracker).setProductId("pdtID").setEvent();
+        new Product(tracker).setProductId("pdtID1").setEvent();
+        new Product(tracker).setProductId("pdtID3").setEvent();
+
+        assertEquals(2, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("pdtl", buffer.getVolatileParams().get(2).getKey());
-        assertEquals("pdtID", buffer.getVolatileParams().get(2).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("pdt", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
+        assertEquals(3, buffer.getVolatileParams().get("pdtl").getValues().size());
+        assertEquals("pdtID", buffer.getVolatileParams().get("pdtl").getValues().get(0).execute());
+        assertEquals("pdtID1", buffer.getVolatileParams().get("pdtl").getValues().get(1).execute());
+        assertEquals("pdtID3", buffer.getVolatileParams().get("pdtl").getValues().get(2).execute());
 
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ProductsTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ProductsTest.java
index 03bfaa34..bacea965 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ProductsTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ProductsTest.java
@@ -32,7 +32,7 @@ of this software and associated documentation files (the "Software"), to deal
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class ProductsTest extends AbstractTestClass {
 
@@ -56,25 +56,19 @@ public void initTest() throws NoSuchFieldException, IllegalAccessException {
     public void addOneTest() {
         Product p = new Product(tracker).setProductId("pdtID");
         p = productsTracker.add(p);
-        p = productsCart.add(p);
+        productsCart.add(p);
 
         assertEquals(1, tracker.getBusinessObjects().size());
         assertEquals(1, tracker.Cart().getProductsList().size());
-
-        assertEquals("pdtID", ((Product) tracker.getBusinessObjects().get(p.getId())).getProductId());
-        assertEquals("pdtID", tracker.Cart().getProductsList().get(0).getProductId());
     }
 
     @Test
     public void addTwoTest() {
-        Product p = productsTracker.add("p1");
+        productsTracker.add("p1");
         productsCart.add("p1");
 
         assertEquals(1, tracker.getBusinessObjects().size());
         assertEquals(1, tracker.Cart().getProductsList().size());
-
-        assertEquals("p1", ((Product) tracker.getBusinessObjects().get(p.getId())).getProductId());
-        assertEquals("p1", tracker.Cart().getProductsList().get(0).getProductId());
     }
 
     @Test
@@ -95,9 +89,6 @@ public void removeTest() {
 
         assertEquals(1, tracker.getBusinessObjects().size());
         assertEquals(1, tracker.Cart().getProductsList().size());
-
-        assertEquals("pdtID2", ((Product) tracker.getBusinessObjects().get(p2.getId())).getProductId());
-        assertEquals("pdtID", tracker.Cart().getProductsList().get(0).getProductId());
     }
 
     @Test
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/PublisherTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/PublisherTest.java
index 579e4acf..8c4f26e8 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/PublisherTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/PublisherTest.java
@@ -30,23 +30,19 @@ of this software and associated documentation files (the "Software"), to deal
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-import java.util.Random;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class PublisherTest extends AbstractTestClass {
 
     private Publisher publisher;
-    private Buffer buffer;
 
     @Before
     public void setUp() throws Exception {
         super.setUp();
         publisher = new Publisher(tracker);
-        buffer = tracker.getBuffer();
     }
 
     @Test
@@ -69,43 +65,18 @@ public void initTest() {
         assertEquals(Publisher.Action.View, publisher.getAction());
     }
 
-    @Test
-    public void setTest() {
-        Random r = new Random();
-        String[] vals = {
-                String.valueOf(r.nextInt(500)),
-                String.valueOf(r.nextInt(500)),
-                String.valueOf(r.nextInt(500)),
-                String.valueOf(r.nextInt(500)),
-                String.valueOf(r.nextInt(500)),
-                String.valueOf(r.nextInt(500)),
-                String.valueOf(r.nextInt(500)),
-                String.valueOf(r.nextInt(500))
-        };
-        int i = 0;
-
-        assertEquals(vals[i], publisher.setCampaignId(vals[i++]).getCampaignId());
-        assertEquals(vals[i], publisher.setAdvertiserId(vals[i++]).getAdvertiserId());
-        assertEquals(vals[i], publisher.setCreation(vals[i++]).getCreation());
-        assertEquals(vals[i], publisher.setFormat(vals[i++]).getFormat());
-        assertEquals(vals[i], publisher.setVariant(vals[i++]).getVariant());
-        assertEquals(vals[i], publisher.setGeneralPlacement(vals[i++]).getGeneralPlacement());
-        assertEquals(vals[i], publisher.setDetailedPlacement(vals[i++]).getDetailedPlacement());
-        assertEquals(vals[i], publisher.setUrl(vals[i]).getUrl());
-        assertEquals(OnAppAd.Action.Touch, publisher.setAction(OnAppAd.Action.Touch).getAction());
-    }
-
     @Test
     public void setEventImpressionTest() {
         publisher.setCampaignId("[pub]").setEvent();
 
         assertEquals(2, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("type", buffer.getVolatileParams().get(0).getKey());
-        assertEquals("AT", buffer.getVolatileParams().get(0).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("AT", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("ati", buffer.getVolatileParams().get(1).getKey());
-        assertEquals("PUB-[pub]-------", buffer.getVolatileParams().get(1).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("ati").getValues().size());
+        assertEquals("PUB-[pub]-------", buffer.getVolatileParams().get("ati").getValues().get(0).execute());
     }
 
     @Test
@@ -114,15 +85,16 @@ public void setEventWithCustomObjectsTest() {
         publisher.setEvent();
 
         assertEquals(3, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("type", buffer.getVolatileParams().get(0).getKey());
-        assertEquals("AT", buffer.getVolatileParams().get(0).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("AT", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("stc", buffer.getVolatileParams().get(1).getKey());
-        assertEquals("{\"test\":\"value\"}", buffer.getVolatileParams().get(1).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("stc").getValues().size());
+        assertEquals("{\"test\":\"value\"}", buffer.getVolatileParams().get("stc").getValues().get(0).execute());
 
-        assertEquals("ati", buffer.getVolatileParams().get(2).getKey());
-        assertEquals("PUB-[pub]-------", buffer.getVolatileParams().get(2).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("ati").getValues().size());
+        assertEquals("PUB-[pub]-------", buffer.getVolatileParams().get("ati").getValues().get(0).execute());
     }
 
     @Test
@@ -130,11 +102,30 @@ public void setEventTouchTest() {
         publisher.setCampaignId("[pub]").setGeneralPlacement("[pub2]").setAction(OnAppAd.Action.Touch).setEvent();
 
         assertEquals(2, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
+
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("AT", buffer.getVolatileParams().get("type").getValues().get(0).execute());
+
+        assertEquals(1, buffer.getVolatileParams().get("atc").getValues().size());
+        assertEquals("PUB-[pub]----[pub2]---", buffer.getVolatileParams().get("atc").getValues().get(0).execute());
+    }
+
+    @Test
+    public void multiplesValuesTest() {
+        new Publisher(tracker).setCampaignId("[pub]").setEvent();
+        new Publisher(tracker).setCampaignId("[pub1]").setEvent();
+        new Publisher(tracker).setCampaignId("[pub2]").setEvent();
+
+        assertEquals(2, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("type", buffer.getVolatileParams().get(0).getKey());
-        assertEquals("AT", buffer.getVolatileParams().get(0).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("AT", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("atc", buffer.getVolatileParams().get(1).getKey());
-        assertEquals("PUB-[pub]----[pub2]---", buffer.getVolatileParams().get(1).getValue().execute());
+        assertEquals(3, buffer.getVolatileParams().get("ati").getValues().size());
+        assertEquals("PUB-[pub]-------", buffer.getVolatileParams().get("ati").getValues().get(0).execute());
+        assertEquals("PUB-[pub1]-------", buffer.getVolatileParams().get("ati").getValues().get(1).execute());
+        assertEquals("PUB-[pub2]-------", buffer.getVolatileParams().get("ati").getValues().get(2).execute());
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/PublishersTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/PublishersTest.java
index 39d55e62..f7cadb16 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/PublishersTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/PublishersTest.java
@@ -28,11 +28,9 @@ of this software and associated documentation files (the "Software"), to deal
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-import java.util.Random;
-
 import static org.junit.Assert.assertEquals;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class PublishersTest extends AbstractTestClass {
 
@@ -46,9 +44,7 @@ public void setUp() throws Exception {
 
     @Test
     public void addTest() {
-        int id = new Random().nextInt(500);
-        Publisher publisher = publishers.add("pub" + id);
+        publishers.add("pub");
         assertEquals(1, tracker.getBusinessObjects().size());
-        assertEquals("pub" + id, ((Publisher) tracker.getBusinessObjects().get(publisher.getId())).getCampaignId());
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ScreenTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ScreenTest.java
index f77ed485..68a0f880 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ScreenTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ScreenTest.java
@@ -31,26 +31,21 @@ of this software and associated documentation files (the "Software"), to deal
 import org.robolectric.annotation.Config;
 
 import java.util.HashMap;
-import java.util.Random;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class ScreenTest extends AbstractTestClass {
 
     private Screen screen;
-    private Buffer buffer;
-    private int i = 0;
 
     @Before
     public void setUp() throws Exception {
         super.setUp();
         screen = new Screen(tracker);
-        buffer = tracker.getBuffer();
-        i = 0;
     }
 
     @Test
@@ -74,55 +69,30 @@ public void CustomVarsTest() {
 
     @Test
     public void OrderTest() {
-        double id = new Random().nextInt(500);
-        Order order = screen.Order("test" + id, id);
-
+        Order order = screen.Order("test", 1.);
         Assert.assertNotNull(order);
         Assert.assertEquals(screen.Order("", 0), order);
-
-        order = screen.Order("", 0);
-
-        Assert.assertEquals(order.getOrderId(), "test" + id);
-        Assert.assertEquals(order.getTurnover(), id);
-
     }
 
     @Test
     public void AisleTest() {
-        int id = new Random().nextInt(500);
-        Aisle aisle = screen.Aisle("test" + id);
+        Aisle aisle = screen.Aisle("test");
         Assert.assertNotNull(aisle);
         Assert.assertEquals(screen.Aisle(""), aisle);
-
-        aisle = screen.Aisle("");
-
-        Assert.assertEquals(aisle.getLevel1(), "test" + id);
     }
 
     @Test
     public void CampaignTest() {
-        int id = new Random().nextInt(500);
-        Campaign campaign = screen.Campaign("test" + id);
+        Campaign campaign = screen.Campaign("test");
         Assert.assertNotNull(campaign);
         Assert.assertEquals(screen.Campaign(""), campaign);
-
-        campaign = screen.Campaign("");
-
-        Assert.assertEquals(campaign.getCampaignId(), "test" + id);
     }
 
     @Test
     public void LocationTest() {
-        double lat = new Random().nextInt(500);
-        double lon = new Random().nextInt(500);
-        Location location = screen.Location(lat, lon);
+        Location location = screen.Location(1, 1);
         Assert.assertNotNull(location);
         Assert.assertEquals(screen.Location(0, 0), location);
-
-        location = screen.Location(0, 0);
-
-        Assert.assertEquals(location.getLatitude(), lat);
-        Assert.assertEquals(location.getLongitude(), lon);
     }
 
     @Test
@@ -134,49 +104,36 @@ public void CustomObjectsTest() {
 
     @Test
     public void InternalSearchTest() {
-        int id = new Random().nextInt(500);
-        InternalSearch internalSearch = screen.InternalSearch("test" + id, id);
+        InternalSearch internalSearch = screen.InternalSearch("test", 1);
         Assert.assertNotNull(internalSearch);
         Assert.assertEquals(screen.InternalSearch("", 0), internalSearch);
-
-        internalSearch = screen.InternalSearch("", 0);
-
-        Assert.assertEquals(internalSearch.getKeyword(), "test" + id);
-        Assert.assertEquals(internalSearch.getResultScreenNumber(), id);
     }
 
     @Test
     public void CustomTreeStructureTest() {
-        int id = new Random().nextInt(500);
-        CustomTreeStructure customTreeStructure = screen.CustomTreeStructure(id);
+        CustomTreeStructure customTreeStructure = screen.CustomTreeStructure(1);
         Assert.assertNotNull(customTreeStructure);
         Assert.assertEquals(screen.CustomTreeStructure(0), customTreeStructure);
-
-        customTreeStructure = screen.CustomTreeStructure(0);
-
-        Assert.assertEquals(customTreeStructure.getCategory1(), id);
-    }
-
-    @Test
-    public void setTest() {
-        boolean rBoolean = new Random().nextBoolean();
-        assertEquals("name", screen.setName("name").getName());
-        assertEquals(123, screen.setLevel2(123).getLevel2());
-        assertEquals(rBoolean, screen.setIsBasketScreen(rBoolean).isBasketScreen());
     }
 
     @Test
     public void setEventTest() {
         screen.setName("name").setChapter3("chapter3").setEvent();
+
         assertEquals(4, buffer.getVolatileParams().size());
-        assertEquals("type", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("screen", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(0, buffer.getPersistentParams().size());
+
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("screen", buffer.getVolatileParams().get("type").getValues().get(0).execute());
+
+        assertEquals(1, buffer.getVolatileParams().get("action").getValues().size());
+        assertEquals("view", buffer.getVolatileParams().get("action").getValues().get(0).execute());
 
-        assertEquals("action", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("view", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("chapter3::name", buffer.getVolatileParams().get("p").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("chapter3::name", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("stc").getValues().size());
+        assertEquals("{}", buffer.getVolatileParams().get("stc").getValues().get(0).execute());
     }
 
     @Test
@@ -184,354 +141,341 @@ public void setEventOnlyChaptersTest() {
         screen.setChapter1("chapter1").setChapter3("chapter3").setEvent();
 
         assertEquals(4, buffer.getVolatileParams().size());
-        assertEquals("type", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("screen", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("action", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("view", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("screen", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("chapter1::chapter3::", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("action").getValues().size());
+        assertEquals("view", buffer.getVolatileParams().get("action").getValues().get(0).execute());
 
-        assertEquals("stc", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("{}", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("chapter1::chapter3::", buffer.getVolatileParams().get("p").getValues().get(0).execute());
+
+        assertEquals(1, buffer.getVolatileParams().get("stc").getValues().size());
+        assertEquals("{}", buffer.getVolatileParams().get("stc").getValues().get(0).execute());
     }
 
     @Test
     public void setEventWithCustomVarsTest() {
-        int id = new Random().nextInt(500);
         screen.setName("name").setChapter3("chapter3");
 
-        CustomVar cv1 = screen.CustomVars().add(id, "test" + id, CustomVar.CustomVarType.Screen);
-        screen.CustomVars().add(id, "test" + id, CustomVar.CustomVarType.App);
-
-        assertEquals(id, cv1.getVarId());
-
+        screen.CustomVars().add(1, "test", CustomVar.CustomVarType.Screen);
+        screen.CustomVars().add(1, "test", CustomVar.CustomVarType.App);
         screen.setEvent();
 
         assertEquals(6, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("f" + id, buffer.getVolatileParams().get(i).getKey());
-        assertEquals("test" + id, buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("f1").getValues().size());
+        assertEquals("test", buffer.getVolatileParams().get("f1").getValues().get(0).execute());
 
-        assertEquals("x" + id, buffer.getVolatileParams().get(i).getKey());
-        assertEquals("test" + id, buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("x1").getValues().size());
+        assertEquals("test", buffer.getVolatileParams().get("x1").getValues().get(0).execute());
 
-        assertEquals("type", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("screen", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("screen", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("action", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("view", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("action").getValues().size());
+        assertEquals("view", buffer.getVolatileParams().get("action").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("chapter3::name", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("chapter3::name", buffer.getVolatileParams().get("p").getValues().get(0).execute());
 
-        assertEquals("stc", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("{}", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("stc").getValues().size());
+        assertEquals("{}", buffer.getVolatileParams().get("stc").getValues().get(0).execute());
     }
 
     @Test
     public void setEventWithCustomObjectsTest() {
-        final int id = new Random().nextInt(500);
         screen.setName("name").setChapter3("chapter3");
         CustomObject co = screen.CustomObjects().add(new HashMap<String, Object>() {{
-            put("key" + id, "value" + id);
+            put("key", "value");
         }});
 
         assertNotNull(co.getId());
 
         screen.setEvent();
 
-        assertEquals(5, buffer.getVolatileParams().size());
-
-        assertEquals("stc", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("{\"key" + id + "\":\"value" + id + "\"}", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(4, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("type", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("screen", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("screen", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("action", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("view", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("action").getValues().size());
+        assertEquals("view", buffer.getVolatileParams().get("action").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("chapter3::name", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("chapter3::name", buffer.getVolatileParams().get("p").getValues().get(0).execute());
 
-        assertEquals("stc", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("{}", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(2, buffer.getVolatileParams().get("stc").getValues().size());
+        assertEquals("{\"key\":\"value\"}", buffer.getVolatileParams().get("stc").getValues().get(0).execute());
+        assertEquals("{}", buffer.getVolatileParams().get("stc").getValues().get(1).execute());
     }
 
     @Test
     public void setEventWithLocation() {
-        double longitude = new Random().nextInt(500);
-        double latitude = new Random().nextInt(500);
-        Location l = screen.setName("name").setChapter3("chapter3").Location(longitude, latitude);
-
-        assertNotNull(l.getId());
+        screen.setName("name").setChapter3("chapter3").Location(1, 1);
 
         screen.setEvent();
 
         assertEquals(6, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("gy", buffer.getVolatileParams().get(i).getKey());
-        assertEquals(String.valueOf(longitude) + "0", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("gy").getValues().size());
+        assertEquals("1.00", buffer.getVolatileParams().get("gy").getValues().get(0).execute());
 
-        assertEquals("gx", buffer.getVolatileParams().get(i).getKey());
-        assertEquals(String.valueOf(latitude) + "0", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("gx").getValues().size());
+        assertEquals("1.00", buffer.getVolatileParams().get("gx").getValues().get(0).execute());
 
-        assertEquals("type", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("screen", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("screen", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("action", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("view", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("action").getValues().size());
+        assertEquals("view", buffer.getVolatileParams().get("action").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("chapter3::name", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("chapter3::name", buffer.getVolatileParams().get("p").getValues().get(0).execute());
 
-        assertEquals("stc", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("{}", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("stc").getValues().size());
+        assertEquals("{}", buffer.getVolatileParams().get("stc").getValues().get(0).execute());
 
     }
 
     @Test
     public void setEventWithCustomTreeStructure() {
         screen.setName("name").setChapter3("chapter3");
-        CustomTreeStructure cts = screen.CustomTreeStructure(4);
-
-        assertNotNull(cts.getId());
+        screen.CustomTreeStructure(4);
 
         screen.setEvent();
 
         assertEquals(5, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("ptype", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("4-0-0", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("ptype").getValues().size());
+        assertEquals("4-0-0", buffer.getVolatileParams().get("ptype").getValues().get(0).execute());
 
-        assertEquals("type", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("screen", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("screen", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("action", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("view", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("action").getValues().size());
+        assertEquals("view", buffer.getVolatileParams().get("action").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("chapter3::name", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("chapter3::name", buffer.getVolatileParams().get("p").getValues().get(0).execute());
 
-        assertEquals("stc", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("{}", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("stc").getValues().size());
+        assertEquals("{}", buffer.getVolatileParams().get("stc").getValues().get(0).execute());
 
     }
 
     @Test
     public void setEventWithAisle() {
         screen.setName("name").setChapter3("chapter3");
-        Aisle a = screen.Aisle("level1");
-
-        assertNotNull(a.getId());
+        screen.Aisle("level1");
 
         screen.setEvent();
 
         assertEquals(5, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("aisl", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("level1", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("aisl").getValues().size());
+        assertEquals("level1", buffer.getVolatileParams().get("aisl").getValues().get(0).execute());
 
-        assertEquals("type", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("screen", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("screen", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("action", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("view", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("action").getValues().size());
+        assertEquals("view", buffer.getVolatileParams().get("action").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("chapter3::name", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("chapter3::name", buffer.getVolatileParams().get("p").getValues().get(0).execute());
 
-        assertEquals("stc", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("{}", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("stc").getValues().size());
+        assertEquals("{}", buffer.getVolatileParams().get("stc").getValues().get(0).execute());
     }
 
     @Test
     public void setEventWithCartTest() {
-        String id = String.valueOf(new Random().nextInt(500));
-        Cart c = tracker.Cart().set(id);
-        Product p = c.Products().add("_product");
-
-        assertNotNull(p.getId());
+        Cart c = tracker.Cart().set("1");
+        c.Products().add("_product");
 
+        screen.setName("name").setChapter3("chapter3");
         screen.setCart(c);
 
         screen.setEvent();
 
         assertEquals(7, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("tp", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("cart", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("tp").getValues().size());
+        assertEquals("cart", buffer.getVolatileParams().get("tp").getValues().get(0).execute());
 
-        assertEquals("idcart", buffer.getVolatileParams().get(i).getKey());
-        assertEquals(id, buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("idcart").getValues().size());
+        assertEquals("1", buffer.getVolatileParams().get("idcart").getValues().get(0).execute());
 
-        assertEquals("pdt1", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("_product", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("pdt1").getValues().size());
+        assertEquals("_product", buffer.getVolatileParams().get("pdt1").getValues().get(0).execute());
 
-        assertEquals("type", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("screen", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("screen", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("action", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("view", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("action").getValues().size());
+        assertEquals("view", buffer.getVolatileParams().get("action").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("chapter3::name", buffer.getVolatileParams().get("p").getValues().get(0).execute());
 
-        assertEquals("stc", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("{}", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("stc").getValues().size());
+        assertEquals("{}", buffer.getVolatileParams().get("stc").getValues().get(0).execute());
 
     }
 
     @Test
     public void setEventWithInternalSearch() {
         screen.setName("name").setChapter3("chapter3");
-        InternalSearch is = screen.InternalSearch("searchLabel", 1);
-
-        assertNotNull(is.getId());
+        screen.InternalSearch("searchLabel", 1);
 
         screen.setEvent();
 
         assertEquals(6, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("mc", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("searchLabel", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("mc").getValues().size());
+        assertEquals("searchLabel", buffer.getVolatileParams().get("mc").getValues().get(0).execute());
 
-        assertEquals("np", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("1", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("np").getValues().size());
+        assertEquals("1", buffer.getVolatileParams().get("np").getValues().get(0).execute());
 
-        assertEquals("type", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("screen", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("screen", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("action", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("view", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("action").getValues().size());
+        assertEquals("view", buffer.getVolatileParams().get("action").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("chapter3::name", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("chapter3::name", buffer.getVolatileParams().get("p").getValues().get(0).execute());
 
-        assertEquals("stc", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("{}", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("stc").getValues().size());
+        assertEquals("{}", buffer.getVolatileParams().get("stc").getValues().get(0).execute());
     }
 
     @Test
     public void setEventWithCampaign() {
         screen.setName("name").setChapter3("chapter3");
-        Campaign c = screen.Campaign("camp");
-
-        assertNotNull(c.getId());
+        screen.Campaign("camp");
 
         screen.setEvent();
 
         assertEquals(5, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("xto", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("camp", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("xto").getValues().size());
+        assertEquals("camp", buffer.getVolatileParams().get("xto").getValues().get(0).execute());
 
-        assertEquals("type", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("screen", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("screen", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("action", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("view", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("action").getValues().size());
+        assertEquals("view", buffer.getVolatileParams().get("action").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("chapter3::name", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("chapter3::name", buffer.getVolatileParams().get("p").getValues().get(0).execute());
 
-        assertEquals("stc", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("{}", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("stc").getValues().size());
+        assertEquals("{}", buffer.getVolatileParams().get("stc").getValues().get(0).execute());
     }
 
     @Test
     public void setEventWithPublishers() {
-        screen.setName("name").setChapter3("chapter3").Publishers().add("campaign").setAction(OnAppAd.Action.Touch);
-        Publisher p = screen.Publishers().add("campaign2").setAction(OnAppAd.Action.Touch);
-
-        assertNotNull(p.getId());
+        screen.setName("name").setChapter3("chapter3")
+                .Publishers().add("campaign").setAction(OnAppAd.Action.Touch);
+        screen.Publishers().add("campaign2").setAction(OnAppAd.Action.Touch);
+        screen.Publishers().add("campaign3").setAction(OnAppAd.Action.Touch);
 
         screen.setEvent();
 
-        assertEquals(6, buffer.getVolatileParams().size());
+        assertEquals(5, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("type", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("screen", buffer.getVolatileParams().get(i++).getValue().execute());
 
-        assertEquals("ati", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("PUB-campaign-------", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(3, buffer.getVolatileParams().get("ati").getValues().size());
+        assertEquals("PUB-campaign-------", buffer.getVolatileParams().get("ati").getValues().get(0).execute());
+        assertEquals("PUB-campaign2-------", buffer.getVolatileParams().get("ati").getValues().get(1).execute());
+        assertEquals("PUB-campaign3-------", buffer.getVolatileParams().get("ati").getValues().get(2).execute());
 
-        assertEquals("ati", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("PUB-campaign2-------", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("screen", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("action", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("view", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("action").getValues().size());
+        assertEquals("view", buffer.getVolatileParams().get("action").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("chapter3::name", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("chapter3::name", buffer.getVolatileParams().get("p").getValues().get(0).execute());
 
-        assertEquals("stc", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("{}", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("stc").getValues().size());
+        assertEquals("{}", buffer.getVolatileParams().get("stc").getValues().get(0).execute());
     }
 
     @Test
     public void setEventWithSelfPromotions() {
-        screen.setName("name").setChapter3("chapter3").SelfPromotions().add(9).setAction(OnAppAd.Action.Touch);
-        SelfPromotion s = screen.SelfPromotions().add(8).setAction(OnAppAd.Action.Touch);
-
-        assertNotNull(s.getId());
+        screen.setName("name").setChapter3("chapter3")
+                .SelfPromotions().add(9).setAction(OnAppAd.Action.Touch);
+        screen.SelfPromotions().add(8).setAction(OnAppAd.Action.Touch);
 
         screen.setEvent();
 
-        assertEquals(6, buffer.getVolatileParams().size());
+        assertEquals(5, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("type", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("screen", buffer.getVolatileParams().get(i++).getValue().execute());
 
-        assertEquals("ati", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("INT-9-||", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(2, buffer.getVolatileParams().get("ati").getValues().size());
+        assertEquals("INT-9-||", buffer.getVolatileParams().get("ati").getValues().get(0).execute());
+        assertEquals("INT-8-||", buffer.getVolatileParams().get("ati").getValues().get(1).execute());
 
-        assertEquals("ati", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("INT-8-||", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("screen", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("action", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("view", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("action").getValues().size());
+        assertEquals("view", buffer.getVolatileParams().get("action").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("chapter3::name", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("chapter3::name", buffer.getVolatileParams().get("p").getValues().get(0).execute());
 
-        assertEquals("stc", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("{}", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("stc").getValues().size());
+        assertEquals("{}", buffer.getVolatileParams().get("stc").getValues().get(0).execute());
     }
 
     @Test
     public void setEventWithOrder() {
-        double turnover = Math.abs(new Random().nextInt(500));
         screen.setName("name").setChapter3("chapter3");
-        Order o = screen.Order("oid", turnover);
-
-        assertNotNull(o.getId());
+        screen.Order("oid", 1.);
 
         screen.setEvent();
 
         assertEquals(7, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("cmd", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("oid", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("cmd").getValues().size());
+        assertEquals("oid", buffer.getVolatileParams().get("cmd").getValues().get(0).execute());
 
-        assertEquals("roimt", buffer.getVolatileParams().get(i).getKey());
-        assertEquals(String.valueOf(turnover), buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("roimt").getValues().size());
+        assertEquals("1.0", buffer.getVolatileParams().get("roimt").getValues().get(0).execute());
 
-        assertEquals("newcus", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("0", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("newcus").getValues().size());
+        assertEquals("0", buffer.getVolatileParams().get("newcus").getValues().get(0).execute());
 
-        assertEquals("type", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("screen", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("screen", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("action", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("view", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("action").getValues().size());
+        assertEquals("view", buffer.getVolatileParams().get("action").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("chapter3::name", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("chapter3::name", buffer.getVolatileParams().get("p").getValues().get(0).execute());
 
-        assertEquals("stc", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("{}", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("stc").getValues().size());
+        assertEquals("{}", buffer.getVolatileParams().get("stc").getValues().get(0).execute());
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ScreensTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ScreensTest.java
index f63cc014..54df6010 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ScreensTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ScreensTest.java
@@ -28,11 +28,9 @@ of this software and associated documentation files (the "Software"), to deal
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-import java.util.Random;
-
 import static org.junit.Assert.assertEquals;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class ScreensTest extends AbstractTestClass {
 
@@ -46,36 +44,19 @@ public void setUp() throws Exception {
 
     @Test
     public void addTest() {
-        Screen screen = screens.add();
+        screens.add();
         assertEquals(1, tracker.getBusinessObjects().size());
-        assertEquals("", ((Screen) tracker.getBusinessObjects().get(screen.getId())).getName());
     }
 
     @Test
     public void addWithLevel2Test() {
-        Screen screen = screens.add("name").setLevel2(3);
+        screens.add("name").setLevel2(3);
         assertEquals(1, tracker.getBusinessObjects().size());
-        assertEquals("name", ((Screen) tracker.getBusinessObjects().get(screen.getId())).getName());
-        assertEquals(3, ((Screen) tracker.getBusinessObjects().get(screen.getId())).getLevel2());
     }
 
     @Test
     public void addWithChaptersTest() {
-        Random r = new Random();
-        String[] vals = {
-                String.valueOf(r.nextInt(500)),
-                String.valueOf(r.nextInt(500)),
-                String.valueOf(r.nextInt(500)),
-                String.valueOf(r.nextInt(500))
-        };
-        int i = 0;
-        Screen screen = screens.add(vals[i++], vals[i++], vals[i++], vals[i]);
-        i = 0;
-
+        screens.add("name", "chap1", "chap2", "chap2");
         assertEquals(1, tracker.getBusinessObjects().size());
-        assertEquals(vals[i++], ((Screen) tracker.getBusinessObjects().get(screen.getId())).getName());
-        assertEquals(vals[i++], ((Screen) tracker.getBusinessObjects().get(screen.getId())).getChapter1());
-        assertEquals(vals[i++], ((Screen) tracker.getBusinessObjects().get(screen.getId())).getChapter2());
-        assertEquals(vals[i], ((Screen) tracker.getBusinessObjects().get(screen.getId())).getChapter3());
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/SelfPromotionTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/SelfPromotionTest.java
index 1384c063..62b44dad 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/SelfPromotionTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/SelfPromotionTest.java
@@ -30,23 +30,19 @@ of this software and associated documentation files (the "Software"), to deal
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-import java.util.Random;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class SelfPromotionTest extends AbstractTestClass {
 
     private SelfPromotion selfPromotion;
-    private Buffer buffer;
 
     @Before
     public void setUp() throws Exception {
         super.setUp();
         selfPromotion = new SelfPromotion(tracker);
-        buffer = tracker.getBuffer();
     }
 
     @Test
@@ -64,26 +60,18 @@ public void initTest() {
         assertEquals(SelfPromotion.Action.View, selfPromotion.getAction());
     }
 
-    @Test
-    public void setTest() {
-        int id = new Random().nextInt(500);
-        assertEquals(23, selfPromotion.setAdId(23).getAdId());
-        assertEquals("test" + id, selfPromotion.setFormat("test" + id).getFormat());
-        assertEquals("truc", selfPromotion.setProductId("truc").getProductId());
-        assertEquals(SelfPromotion.Action.Touch, selfPromotion.setAction(SelfPromotion.Action.Touch).getAction());
-    }
-
     @Test
     public void setEventImpressionTest() {
         selfPromotion.setAdId(98).setEvent();
 
         assertEquals(2, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("type", buffer.getVolatileParams().get(0).getKey());
-        assertEquals("AT", buffer.getVolatileParams().get(0).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("AT", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("ati", buffer.getVolatileParams().get(1).getKey());
-        assertEquals("INT-98-||", buffer.getVolatileParams().get(1).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("ati").getValues().size());
+        assertEquals("INT-98-||", buffer.getVolatileParams().get("ati").getValues().get(0).execute());
     }
 
     @Test
@@ -92,15 +80,16 @@ public void setEventWithCustomObjectsTest() {
         selfPromotion.setEvent();
 
         assertEquals(3, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("type", buffer.getVolatileParams().get(0).getKey());
-        assertEquals("AT", buffer.getVolatileParams().get(0).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("AT", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("stc", buffer.getVolatileParams().get(1).getKey());
-        assertEquals("{\"test\":\"value\"}", buffer.getVolatileParams().get(1).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("stc").getValues().size());
+        assertEquals("{\"test\":\"value\"}", buffer.getVolatileParams().get("stc").getValues().get(0).execute());
 
-        assertEquals("ati", buffer.getVolatileParams().get(2).getKey());
-        assertEquals("INT-4-||", buffer.getVolatileParams().get(2).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("ati").getValues().size());
+        assertEquals("INT-4-||", buffer.getVolatileParams().get("ati").getValues().get(0).execute());
     }
 
     @Test
@@ -108,11 +97,30 @@ public void setEventTouchTest() {
         selfPromotion.setAdId(98).setProductId("pdt").setAction(OnAppAd.Action.Touch).setEvent();
 
         assertEquals(2, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
+
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("AT", buffer.getVolatileParams().get("type").getValues().get(0).execute());
+
+        assertEquals(1, buffer.getVolatileParams().get("atc").getValues().size());
+        assertEquals("INT-98-||pdt", buffer.getVolatileParams().get("atc").getValues().get(0).execute());
+    }
+
+    @Test
+    public void multipleValuesTest() {
+        new SelfPromotion(tracker).setAdId(98).setProductId("pdt").setAction(OnAppAd.Action.Touch).setEvent();
+        new SelfPromotion(tracker).setAdId(99).setProductId("pdt").setAction(OnAppAd.Action.Touch).setEvent();
+        new SelfPromotion(tracker).setAdId(100).setProductId("pdt").setAction(OnAppAd.Action.Touch).setEvent();
+
+        assertEquals(2, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
 
-        assertEquals("type", buffer.getVolatileParams().get(0).getKey());
-        assertEquals("AT", buffer.getVolatileParams().get(0).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("AT", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("atc", buffer.getVolatileParams().get(1).getKey());
-        assertEquals("INT-98-||pdt", buffer.getVolatileParams().get(1).getValue().execute());
+        assertEquals(3, buffer.getVolatileParams().get("atc").getValues().size());
+        assertEquals("INT-98-||pdt", buffer.getVolatileParams().get("atc").getValues().get(0).execute());
+        assertEquals("INT-99-||pdt", buffer.getVolatileParams().get("atc").getValues().get(1).execute());
+        assertEquals("INT-100-||pdt", buffer.getVolatileParams().get("atc").getValues().get(2).execute());
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/SelfPromotionsTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/SelfPromotionsTest.java
index c2593fcb..3850eadd 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/SelfPromotionsTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/SelfPromotionsTest.java
@@ -28,8 +28,6 @@ of this software and associated documentation files (the "Software"), to deal
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-import java.util.Random;
-
 import static org.junit.Assert.assertEquals;
 
 @Config(sdk =21)
@@ -46,9 +44,7 @@ public void setUp() throws Exception {
 
     @Test
     public void addTest() {
-        int id = new Random().nextInt(500);
-        SelfPromotion self = selfPromotions.add(id);
+        selfPromotions.add(2);
         assertEquals(1, tracker.getBusinessObjects().size());
-        assertEquals(id, ((SelfPromotion) tracker.getBusinessObjects().get(self.getId())).getAdId());
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/TVTrackingTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/TVTrackingTest.java
index 2c55bf3c..75ad5f03 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/TVTrackingTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/TVTrackingTest.java
@@ -29,44 +29,37 @@ of this software and associated documentation files (the "Software"), to deal
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
+import java.util.ArrayList;
 import java.util.Random;
 
 import static org.junit.Assert.assertEquals;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class TVTrackingTest extends AbstractTestClass {
 
     private TVTracking tvTracking;
-    private Buffer buffer;
 
     @Before
     public void setUp() throws Exception {
         super.setUp();
-        Configuration configuration = tracker.getConfiguration();
-        configuration.put("plugins", "tvtracking");
-        tracker = new Tracker(RuntimeEnvironment.application, configuration);
-        tvTracking = new TVTracking(tracker);
-        buffer = tracker.getBuffer();
+        tracker.setPlugins(new ArrayList<Tracker.PluginKey>() {{
+            add(Tracker.PluginKey.tvtracking);
+        }}, null, true);
         buffer.getPersistentParams().clear();
+        tvTracking = new TVTracking(tracker);
     }
 
     @Test
-    public void getCampaignURLTest() {
+    public void initTest() {
         assertEquals("", tvTracking.getCampaignURL());
-    }
-
-    @Test
-    public void getVisitDurationURLTest() {
         assertEquals(10, tvTracking.getVisitDuration());
     }
 
     @Test
     public void setWithoutConfigTest() {
-        Configuration configuration = tracker.getConfiguration();
-        configuration.put("plugins", "");
-        tracker = new Tracker(RuntimeEnvironment.application, configuration);
-        tracker.getBuffer().getPersistentParams().clear();
+        tracker.setPlugins(new ArrayList<Tracker.PluginKey>(), null, true);
+        buffer.getPersistentParams().clear();
         tvTracking.set();
 
         assertEquals(0, buffer.getPersistentParams().size());
@@ -79,8 +72,7 @@ public void setOneTest() {
         assertEquals("", tvTracking.getCampaignURL());
         assertEquals(10, tvTracking.getVisitDuration());
         assertEquals(1, buffer.getPersistentParams().size());
-        assertEquals("tvt", buffer.getPersistentParams().get(0).getKey());
-        assertEquals("true", buffer.getPersistentParams().get(0).getValue().execute());
+        assertEquals("true", buffer.getPersistentParams().get("tvt").getValues().get(0).execute());
     }
 
     @Test
@@ -90,8 +82,7 @@ public void setTwoTest() {
         assertEquals("titi.fr", tvTracking.getCampaignURL());
         assertEquals(10, tvTracking.getVisitDuration());
         assertEquals(1, buffer.getPersistentParams().size());
-        assertEquals("tvt", buffer.getPersistentParams().get(0).getKey());
-        assertEquals("true", buffer.getPersistentParams().get(0).getValue().execute());
+        assertEquals("true", buffer.getPersistentParams().get("tvt").getValues().get(0).execute());
     }
 
     @Test
@@ -103,8 +94,7 @@ public void setThreeTest() {
         assertEquals(url, tvTracking.getCampaignURL());
         assertEquals(duration, tvTracking.getVisitDuration());
         assertEquals(1, buffer.getPersistentParams().size());
-        assertEquals("tvt", buffer.getPersistentParams().get(0).getKey());
-        assertEquals("true", buffer.getPersistentParams().get(0).getValue().execute());
+        assertEquals("true", buffer.getPersistentParams().get("tvt").getValues().get(0).execute());
     }
 
     @Test
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/TechnicalContextTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/TechnicalContextTest.java
index c2e27d5f..2c404ba9 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/TechnicalContextTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/TechnicalContextTest.java
@@ -34,9 +34,9 @@ of this software and associated documentation files (the "Software"), to deal
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertTrue;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
-public final class TechnicalContextTest extends AbstractTestClass {
+public class TechnicalContextTest extends AbstractTestClass {
 
     @Test
     public void getConnectionTest() {
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ToolTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ToolTest.java
index 26a77876..1bec0597 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ToolTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/ToolTest.java
@@ -29,18 +29,18 @@ of this software and associated documentation files (the "Software"), to deal
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-import java.util.ArrayList;
 import java.util.Map;
 
 import static com.atinternet.tracker.Tracker.OfflineMode.always;
 import static com.atinternet.tracker.Tracker.OfflineMode.never;
 import static com.atinternet.tracker.Tracker.OfflineMode.required;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class ToolTest extends AbstractTestClass {
 
@@ -64,9 +64,9 @@ public void formatNumberLengthTest() {
 
     @Test
     public void parseJSONTest() {
-        assertNull(Tool.parseJSON("test"));
-        assertNotNull(Tool.parseJSON("{\"test\": [1,2,3]}"));
-        assertNotNull(Tool.parseJSON("[1,2,3]"));
+        assertFalse(Tool.isJSONObject("test"));
+        assertTrue(Tool.isJSONObject("{\"test\": [1,2,3]}"));
+        assertTrue(Tool.isJSONArray("[1,2,3]"));
     }
 
     @Test
@@ -99,25 +99,14 @@ public void appendParameterValuesTest() {
             public String execute() {
                 return "test";
             }
-        }, Param.Type.Closure);
-        final Param p1 = new Param("test", new Closure() {
+        });
+        p.getValues().add(new Closure() {
             @Override
             public String execute() {
                 return "value";
             }
-        }, Param.Type.Closure);
-        final Param p2 = new Param("test", new Closure() {
-            @Override
-            public String execute() {
-                return "set";
-            }
-        }, Param.Type.Closure);
-        ArrayList<Param> list = new ArrayList<Param>() {{
-            add(p);
-            add(p1);
-            add(p2);
-        }};
-
-        assertEquals("test,value,set", Tool.appendParameterValues("test", list, new ArrayList<Param>()));
+        });
+
+        assertEquals("test,value", Tool.appendParameterValues(p));
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/TrackerTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/TrackerTest.java
index 287731ef..9569c8a9 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/TrackerTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/TrackerTest.java
@@ -22,6 +22,7 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
+import android.app.Application;
 import android.text.format.DateFormat;
 
 import org.junit.Before;
@@ -33,7 +34,6 @@ of this software and associated documentation files (the "Software"), to deal
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.Random;
 
 import static com.atinternet.tracker.Tracker.OfflineMode;
@@ -42,19 +42,17 @@ of this software and associated documentation files (the "Software"), to deal
 import static com.atinternet.tracker.Tracker.getStorage;
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNotSame;
 import static junit.framework.Assert.assertNull;
 import static junit.framework.Assert.assertTrue;
 import static org.junit.Assert.assertFalse;
 
 @Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
+@SuppressWarnings("unchecked")
 public class TrackerTest extends AbstractTestClass {
 
-    private static final int DURATION_SLEEP = 400;
+    private static final int DURATION_SLEEP = 600;
 
-
-    private Buffer buffer;
     private Storage storage;
     private final String key = "KEY";
     private SetConfigCallback callback;
@@ -64,9 +62,6 @@ public void setUp() throws Exception {
         super.setUp();
         today = String.valueOf(DateFormat.format(pattern, System.currentTimeMillis()));
         storage = getStorage();
-        buffer = tracker.getBuffer();
-        buffer.getPersistentParams().clear();
-        buffer.getVolatileParams().clear();
         callback = new SetConfigCallback() {
             @Override
             public void setConfigEnd() {
@@ -76,50 +71,30 @@ public void setConfigEnd() {
     }
 
     @Test
-    public void initTrackerTest() {
-        HashMap<String, Object> conf = new HashMap<String, Object>() {{
-            put("storage", "always");
-            put("storageduration", 2);
-            put("enableCrashDetection", true);
-        }};
-        Tracker t = new Tracker(RuntimeEnvironment.application, conf);
-        assertNotNull(tracker);
-        assertNotSame(tracker, t);
-    }
-
-    @Test
-    public void getConfigurationTest() {
-        assertEquals(18, tracker.getConfiguration().size());
-        assertTrue(tracker.getConfiguration().containsKey("log"));
-        assertTrue(tracker.getConfiguration().containsKey("logSSL"));
-        assertTrue(tracker.getConfiguration().containsKey("site"));
-        assertTrue(tracker.getConfiguration().containsKey("domain"));
-        assertTrue(tracker.getConfiguration().containsKey("pixelPath"));
-        assertTrue(tracker.getConfiguration().containsKey("storage"));
-        assertTrue(tracker.getConfiguration().containsKey("plugins"));
-        assertTrue(tracker.getConfiguration().containsKey("identifier"));
-        assertTrue(tracker.getConfiguration().containsKey("secure"));
-        assertTrue(tracker.getConfiguration().containsKey("hashUserId"));
-        assertTrue(tracker.getConfiguration().containsKey("persistIdentifiedVisitor"));
-        assertTrue(tracker.getConfiguration().containsKey("tvtURL"));
-        assertTrue(tracker.getConfiguration().containsKey("tvtVisitDuration"));
-        assertTrue(tracker.getConfiguration().containsKey("enableCrashDetection"));
-        assertTrue(tracker.getConfiguration().containsKey("campaignLastPersistence"));
-        assertTrue(tracker.getConfiguration().containsKey("campaignLifetime"));
-        assertTrue(tracker.getConfiguration().containsKey("tvtSpotValidityTime"));
-        assertTrue(tracker.getConfiguration().containsKey("sessionBackgroundDuration"));
+    public void Constructor() {
+        Tracker.appContext = null;
+        new Tracker();
+        assertTrue(Tracker.appContext.get() instanceof Application);
+
+        Tracker.appContext = null;
+        new Tracker(RuntimeEnvironment.application);
+        assertTrue(Tracker.appContext.get() instanceof Application);
+
+        Tracker.appContext = null;
+        new Tracker(new HashMap<String, Object>());
+        assertTrue(Tracker.appContext.get() instanceof Application);
+
+        Tracker.appContext = null;
+        new Tracker(RuntimeEnvironment.application, new HashMap<String, Object>());
+        assertTrue(Tracker.appContext.get() instanceof Application);
     }
 
+
     @Test
     public void getContextTest() {
         assertEquals(RuntimeEnvironment.application, getAppContext());
     }
 
-    @Test
-    public void getListenerTest() {
-        assertNull(tracker.getListener());
-    }
-
     @Test
     public void getUserIdSyncTest() throws InterruptedException {
         assertNull(tracker.getUserIdSync());
@@ -128,8 +103,7 @@ public void getUserIdSyncTest() throws InterruptedException {
         ((ArrayList<String>) builder.build()[0]).get(0);
         assertEquals("test", tracker.getUserIdSync());
 
-        tracker.setHashUserIdEnabled(true, null);
-        Thread.sleep(DURATION_SLEEP);
+        tracker.setHashUserIdEnabled(true, null, true);
         ((ArrayList<String>) builder.build()[0]).get(0);
         assertEquals("8652e6fddc89d1392129e8f5ade37e4288406503e5b73bad51619d6e4f3ce50c", tracker.getUserIdSync());
 
@@ -139,53 +113,10 @@ public void getUserIdSyncTest() throws InterruptedException {
 
     }
 
-    @Test
-    public void setListenerTest() {
-        TrackerListener listener = new TrackerListener() {
-            @Override
-            public void trackerNeedsFirstLaunchApproval(String message) {
-
-            }
-
-            @Override
-            public void buildDidEnd(HitStatus status, String message) {
-
-            }
-
-            @Override
-            public void sendDidEnd(HitStatus status, String message) {
-
-            }
-
-            @Override
-            public void didCallPartner(String response) {
-
-            }
-
-            @Override
-            public void warningDidOccur(String message) {
-
-            }
-
-            @Override
-            public void saveDidEnd(String message) {
-
-            }
-
-            @Override
-            public void errorDidOccur(String message) {
-
-            }
-        };
-        tracker.setListener(listener);
-        assertNotNull(tracker.getListener());
-        assertEquals(listener, tracker.getListener());
-    }
-
     @Test
     public void setConfigTest() throws Exception {
         assertFalse(tracker.getConfiguration().containsKey("key"));
-        tracker.setConfig("key", "value", null);
+        tracker.setConfig("key", "value", callback);
         Thread.sleep(DURATION_SLEEP);
         assertTrue(tracker.getConfiguration().containsKey("key"));
         assertEquals(tracker.getConfiguration().get("key"), "value");
@@ -193,50 +124,34 @@ public void setConfigTest() throws Exception {
 
     @Test
     public void setLogTest() throws Exception {
-        Random r = new Random();
-        int id = r.nextInt(DURATION_SLEEP);
-        boolean rBoolean = r.nextBoolean();
-
         assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.LOG), "logp");
-        tracker.setLog("logtest" + id, rBoolean ? callback : null);
+        tracker.setLog("logtest", callback);
         Thread.sleep(DURATION_SLEEP);
-        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.LOG), "logtest" + id);
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.LOG), "logtest");
     }
 
     @Test
     public void setSecuredLogTest() throws Exception {
-        Random r = new Random();
-        int id = r.nextInt(DURATION_SLEEP);
-        boolean rBoolean = r.nextBoolean();
-
         assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.LOG_SSL), "logs");
-        tracker.setSecuredLog("logstest" + id, rBoolean ? callback : null);
+        tracker.setSecuredLog("logstest", callback);
         Thread.sleep(DURATION_SLEEP);
-        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.LOG_SSL), "logstest" + id);
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.LOG_SSL), "logstest");
     }
 
     @Test
     public void setDomainTest() throws Exception {
-        Random r = new Random();
-        int id = r.nextInt(DURATION_SLEEP);
-        boolean rBoolean = r.nextBoolean();
-
         assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.DOMAIN), "xiti.com");
-        tracker.setDomain("domain" + id, rBoolean ? callback : null);
+        tracker.setDomain("domain", callback);
         Thread.sleep(DURATION_SLEEP);
-        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.DOMAIN), "domain" + id);
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.DOMAIN), "domain");
     }
 
     @Test
     public void setSiteIdTest() throws Exception {
-        Random r = new Random();
-        int id = r.nextInt(DURATION_SLEEP);
-        boolean rBoolean = r.nextBoolean();
-
         assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.SITE), 552987);
-        tracker.setSiteId(id, rBoolean ? callback : null);
+        tracker.setSiteId(1, callback);
         Thread.sleep(DURATION_SLEEP);
-        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.SITE), id);
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.SITE), 1);
     }
 
     @Test
@@ -251,129 +166,242 @@ public void setOfflineModeTest() throws Exception {
     }
 
     @Test
-    public void setPlugins() throws Exception {
-        Random r = new Random();
-        boolean rBoolean = r.nextBoolean();
-
+    public void setPluginsTest() throws Exception {
         assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.PLUGINS), "");
         tracker.setPlugins(new ArrayList<Tracker.PluginKey>() {{
             add(Tracker.PluginKey.tvtracking);
-        }}, rBoolean ? callback : null);
+        }}, callback);
         Thread.sleep(DURATION_SLEEP);
         assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.PLUGINS), Tracker.PluginKey.tvtracking.toString());
         tracker.setPlugins(new ArrayList<Tracker.PluginKey>() {{
             add(Tracker.PluginKey.tvtracking);
             add(Tracker.PluginKey.nuggad);
-        }}, rBoolean ? callback : null);
+        }}, callback);
         Thread.sleep(DURATION_SLEEP);
         assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.PLUGINS), Tracker.PluginKey.tvtracking.toString() + "," + Tracker.PluginKey.nuggad.toString());
-        tracker.setPlugins(null, rBoolean ? callback : null);
+        tracker.setPlugins(null, callback);
         Thread.sleep(DURATION_SLEEP);
         assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.PLUGINS), "");
     }
 
     @Test
     public void setSecureTest() throws Exception {
-        Random r = new Random();
-        boolean rBoolean = r.nextBoolean();
-
         assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.SECURE), false);
-        tracker.setSecureModeEnabled(rBoolean, rBoolean ? callback : null);
+        tracker.setSecureModeEnabled(true, callback);
         Thread.sleep(DURATION_SLEEP);
-        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.SECURE), rBoolean);
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.SECURE), true);
     }
 
     @Test
     public void setIdentifierTest() throws Exception {
-        Random r = new Random();
-        boolean rBoolean = r.nextBoolean();
-
         assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.IDENTIFIER), "androidId");
-        tracker.setIdentifierType(Tracker.IdentifierType.advertisingId, rBoolean ? callback : null);
+        tracker.setIdentifierType(Tracker.IdentifierType.advertisingId, callback);
         Thread.sleep(DURATION_SLEEP);
         assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.IDENTIFIER), "advertisingId");
-        tracker.setIdentifierType(Tracker.IdentifierType.UUID, rBoolean ? callback : null);
+        tracker.setIdentifierType(Tracker.IdentifierType.UUID, callback);
         Thread.sleep(DURATION_SLEEP);
         assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.IDENTIFIER), "UUID");
     }
 
     @Test
     public void setHashUserIdModeTest() throws Exception {
-        Random r = new Random();
-        boolean rBoolean = r.nextBoolean();
-
         assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.HASH_USER_ID), false);
-        tracker.setHashUserIdEnabled(rBoolean, rBoolean ? callback : null);
+        tracker.setHashUserIdEnabled(true, callback);
         Thread.sleep(DURATION_SLEEP);
-        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.HASH_USER_ID), rBoolean);
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.HASH_USER_ID), true);
     }
 
     @Test
     public void setPixelPathTest() throws Exception {
-        Random r = new Random();
-        boolean rBoolean = r.nextBoolean();
-        int id = r.nextInt(DURATION_SLEEP);
         assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.PIXEL_PATH), "/hit.xiti");
-        tracker.setPixelPath("/test.xiti" + id, rBoolean ? callback : null);
+        tracker.setPixelPath("/test.xiti", callback);
         Thread.sleep(DURATION_SLEEP);
-        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.PIXEL_PATH), "/test.xiti" + id);
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.PIXEL_PATH), "/test.xiti");
     }
 
     @Test
     public void setPersistIdentifiedVisitorTest() throws Exception {
-        Random r = new Random();
-        boolean rBoolean = r.nextBoolean();
-
         assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.PERSIST_IDENTIFIED_VISITOR), true);
-        tracker.setPersistentIdentifiedVisitorEnabled(rBoolean, rBoolean ? callback : null);
+        tracker.setPersistentIdentifiedVisitorEnabled(false, callback);
         Thread.sleep(DURATION_SLEEP);
-        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.PERSIST_IDENTIFIED_VISITOR), rBoolean);
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.PERSIST_IDENTIFIED_VISITOR), false);
     }
 
     @Test
     public void setCrashDetectionTest() throws Exception {
-        Random r = new Random();
-        boolean rBoolean = r.nextBoolean();
-
         assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.ENABLE_CRASH_DETECTION), true);
-        tracker.setCrashDetectionEnabled(rBoolean, rBoolean ? callback : null);
+        tracker.setCrashDetectionEnabled(false, callback);
         Thread.sleep(DURATION_SLEEP);
-        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.ENABLE_CRASH_DETECTION), rBoolean);
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.ENABLE_CRASH_DETECTION), false);
     }
 
     @Test
     public void setCampaignLastPersistenceTest() throws Exception {
-        Random r = new Random();
-        boolean rBoolean = r.nextBoolean();
-
         assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.CAMPAIGN_LAST_PERSISTENCE), false);
-        tracker.setCampaignLastPersistenceEnabled(rBoolean, rBoolean ? callback : null);
+        tracker.setCampaignLastPersistenceEnabled(true, callback);
         Thread.sleep(DURATION_SLEEP);
-        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.CAMPAIGN_LAST_PERSISTENCE), rBoolean);
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.CAMPAIGN_LAST_PERSISTENCE), true);
     }
 
     @Test
     public void setCampaigLifetimeTest() throws Exception {
-        Random r = new Random();
-        boolean rBoolean = r.nextBoolean();
-        int id = r.nextInt(DURATION_SLEEP);
-
         assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.CAMPAIGN_LIFETIME), 30);
-        tracker.setCampaignLifetime(id, rBoolean ? callback : null);
+        tracker.setCampaignLifetime(3, callback);
         Thread.sleep(DURATION_SLEEP);
-        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.CAMPAIGN_LIFETIME), id);
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.CAMPAIGN_LIFETIME), 3);
     }
 
     @Test
     public void setSessionBackgroundDurationTest() throws Exception {
-        Random r = new Random();
-        boolean rBoolean = r.nextBoolean();
-        int id = r.nextInt(DURATION_SLEEP);
-
         assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.SESSION_BACKGROUND_DURATION), 60);
-        tracker.setSessionBackgroundDuration(id, rBoolean ? callback : null);
+        tracker.setSessionBackgroundDuration(2, callback);
         Thread.sleep(DURATION_SLEEP);
-        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.SESSION_BACKGROUND_DURATION), id);
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.SESSION_BACKGROUND_DURATION), 2);
+    }
+
+    @Test
+    public void setConfigSyncTest() throws Exception {
+        assertFalse(tracker.getConfiguration().containsKey("key"));
+        tracker.setConfig("key", "value", null, true);
+        assertTrue(tracker.getConfiguration().containsKey("key"));
+        assertEquals(tracker.getConfiguration().get("key"), "value");
+    }
+
+    @Test
+    public void setLogSyncTest() throws Exception {
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.LOG), "logp");
+        tracker.setLog("logtest", null, true);
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.LOG), "logtest");
+    }
+
+    @Test
+    public void setSecuredLogSyncTest() throws Exception {
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.LOG_SSL), "logs");
+        tracker.setSecuredLog("logstest", null, true);
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.LOG_SSL), "logstest");
+    }
+
+    @Test
+    public void setDomainSyncTest() throws Exception {
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.DOMAIN), "xiti.com");
+        tracker.setDomain("domain", null, true);
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.DOMAIN), "domain");
+    }
+
+    @Test
+    public void setSiteIdSyncTest() throws Exception {
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.SITE), 552987);
+        tracker.setSiteId(2, null, true);
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.SITE), 2);
+    }
+
+    @Test
+    public void setOfflineModeSyncTest() throws Exception {
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.OFFLINE_MODE), "required");
+        tracker.setOfflineMode(OfflineMode.always, null, true);
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.OFFLINE_MODE), "always");
+    }
+
+    @Test
+    public void setPluginsSyncTest() throws Exception {
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.PLUGINS), "");
+        tracker.setPlugins(new ArrayList<Tracker.PluginKey>() {{
+            add(Tracker.PluginKey.tvtracking);
+        }}, null, true);
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.PLUGINS), Tracker.PluginKey.tvtracking.toString());
+        tracker.setPlugins(new ArrayList<Tracker.PluginKey>() {{
+            add(Tracker.PluginKey.tvtracking);
+            add(Tracker.PluginKey.nuggad);
+        }}, null, true);
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.PLUGINS), Tracker.PluginKey.tvtracking.toString() + "," + Tracker.PluginKey.nuggad.toString());
+        tracker.setPlugins(null, null, true);
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.PLUGINS), "");
+    }
+
+    @Test
+    public void setSecureSyncTest() throws Exception {
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.SECURE), false);
+        tracker.setSecureModeEnabled(true, null, true);
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.SECURE), true);
+    }
+
+    @Test
+    public void setIdentifierSyncTest() throws Exception {
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.IDENTIFIER), "androidId");
+        tracker.setIdentifierType(Tracker.IdentifierType.advertisingId, null, true);
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.IDENTIFIER), "advertisingId");
+        tracker.setIdentifierType(Tracker.IdentifierType.UUID, null, true);
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.IDENTIFIER), "UUID");
+    }
+
+    @Test
+    public void setHashUserIdModeSyncTest() throws Exception {
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.HASH_USER_ID), false);
+        tracker.setHashUserIdEnabled(true, null, true);
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.HASH_USER_ID), true);
+    }
+
+    @Test
+    public void setPixelPathSyncTest() throws Exception {
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.PIXEL_PATH), "/hit.xiti");
+        tracker.setPixelPath("/test.xiti", null, true);
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.PIXEL_PATH), "/test.xiti");
+    }
+
+    @Test
+    public void setPersistIdentifiedVisitorSyncTest() throws Exception {
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.PERSIST_IDENTIFIED_VISITOR), true);
+        tracker.setPersistentIdentifiedVisitorEnabled(false, null, true);
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.PERSIST_IDENTIFIED_VISITOR), false);
+    }
+
+    @Test
+    public void setCrashDetectionSyncTest() throws Exception {
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.ENABLE_CRASH_DETECTION), true);
+        tracker.setCrashDetectionEnabled(false, null, true);
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.ENABLE_CRASH_DETECTION), false);
+    }
+
+    @Test
+    public void setCampaignLastPersistenceSyncTest() throws Exception {
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.CAMPAIGN_LAST_PERSISTENCE), false);
+        tracker.setCampaignLastPersistenceEnabled(true, null, true);
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.CAMPAIGN_LAST_PERSISTENCE), true);
+    }
+
+    @Test
+    public void setCampaigLifetimeSyncTest() throws Exception {
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.CAMPAIGN_LIFETIME), 30);
+        tracker.setCampaignLifetime(2, null, true);
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.CAMPAIGN_LIFETIME), 2);
+    }
+
+    @Test
+    public void setSessionBackgroundDurationSyncTest() throws Exception {
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.SESSION_BACKGROUND_DURATION), 60);
+        tracker.setSessionBackgroundDuration(2, null, true);
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.SESSION_BACKGROUND_DURATION), 2);
+    }
+
+    @Test
+    public void setTvTrackingUrlSyncTest() throws Exception {
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.TVTRACKING_URL), "");
+        tracker.setTvTrackingUrl("test", null, true);
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.TVTRACKING_URL), "test");
+    }
+
+    @Test
+    public void setTvTrackingVisitDurationSyncTest() throws Exception {
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.TVTRACKING_VISIT_DURATION), 10);
+        tracker.setTvTrackingVisitDuration(2, null, true);
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.TVTRACKING_VISIT_DURATION), 2);
+    }
+
+    @Test
+    public void setTvTrackingSpotValidityTimeSyncTest() throws Exception {
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.TVTRACKING_SPOT_VALIDITY_TIME), 5);
+        tracker.setTvTrackingSpotValidityTime(2, null, true);
+        assertEquals(tracker.getConfiguration().get(TrackerConfigurationKeys.TVTRACKING_SPOT_VALIDITY_TIME), 2);
     }
 
     @Test
@@ -545,35 +573,57 @@ public void toStringEnumTest() {
 
     @Test
     public void setParamIntTest() {
-        tracker = tracker.setParam(key, 1);
-        assertEquals("1", buffer.getVolatileParams().get(0).getValue().execute());
+        tracker.setParam(key, 1);
+
+        assertEquals(1, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
+
+        assertEquals(1, buffer.getVolatileParams().get(key).getValues().size());
+        assertEquals("1", buffer.getVolatileParams().get(key).getValues().get(0).execute());
     }
 
     @Test
     public void setParamBooleanTest() {
-        boolean rBoolean = new Random().nextBoolean();
-        tracker = tracker.setParam(key, rBoolean);
-        assertEquals(String.valueOf(rBoolean), buffer.getVolatileParams().get(0).getValue().execute());
+        tracker.setParam(key, true);
+
+        assertEquals(1, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
+
+        assertEquals(1, buffer.getVolatileParams().get(key).getValues().size());
+        assertEquals("true", buffer.getVolatileParams().get(key).getValues().get(0).execute());
     }
 
     @Test
     public void setParamFloatTest() {
-        float number = new Random().nextFloat();
-        tracker = tracker.setParam(key, number);
-        assertEquals(String.valueOf(number), buffer.getVolatileParams().get(0).getValue().execute());
+        tracker.setParam(key, 1.f);
+
+        assertEquals(1, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
+
+        assertEquals(1, buffer.getVolatileParams().get(key).getValues().size());
+        assertEquals(String.valueOf(1.f), buffer.getVolatileParams().get(key).getValues().get(0).execute());
     }
 
     @Test
     public void setParamDoubleTest() {
-        double number = new Random().nextInt(DURATION_SLEEP);
-        tracker = tracker.setParam(key, number);
-        assertEquals(String.valueOf(number), buffer.getVolatileParams().get(0).getValue().execute());
+        tracker.setParam(key, 1.5);
+
+        assertEquals(1, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
+
+        assertEquals(1, buffer.getVolatileParams().get(key).getValues().size());
+        assertEquals("1.5", buffer.getVolatileParams().get(key).getValues().get(0).execute());
     }
 
     @Test
     public void setParamStringTest() {
-        tracker = tracker.setParam(key, "StringValue");
-        assertEquals("StringValue", buffer.getVolatileParams().get(0).getValue().execute());
+        tracker.setParam(key, "StringValue");
+
+        assertEquals(1, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
+
+        assertEquals(1, buffer.getVolatileParams().get(key).getValues().size());
+        assertEquals("StringValue", buffer.getVolatileParams().get(key).getValues().get(0).execute());
     }
 
     @Test
@@ -583,15 +633,25 @@ public void setParamArrayTest() {
             add(2);
             add(3);
         }};
-        tracker = tracker.setParam(key, array);
-        assertEquals("1,2,3", buffer.getVolatileParams().get(0).getValue().execute());
+        tracker.setParam(key, array);
+
+        assertEquals(1, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
+
+        assertEquals(1, buffer.getVolatileParams().get(key).getValues().size());
+        assertEquals("1,2,3", buffer.getVolatileParams().get(key).getValues().get(0).execute());
     }
 
     @Test
     public void setParamTabTest() {
         Float[] tab = new Float[]{1.f, 2.f};
-        tracker = tracker.setParam(key, tab);
-        assertEquals("1.0,2.0", buffer.getVolatileParams().get(0).getValue().execute());
+        tracker.setParam(key, tab);
+
+        assertEquals(1, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
+
+        assertEquals(1, buffer.getVolatileParams().get(key).getValues().size());
+        assertEquals("1.0,2.0", buffer.getVolatileParams().get(key).getValues().get(0).execute());
     }
 
     @Test
@@ -600,8 +660,13 @@ public void setParamMapTest() {
             put("boolean1", true);
             put("boolean2", false);
         }};
-        tracker = tracker.setParam(key, map);
-        assertEquals("{\"boolean2\":false,\"boolean1\":true}", buffer.getVolatileParams().get(0).getValue().execute());
+        tracker.setParam(key, map);
+
+        assertEquals(1, buffer.getVolatileParams().size());
+        assertEquals(0, buffer.getPersistentParams().size());
+
+        assertEquals(1, buffer.getVolatileParams().get(key).getValues().size());
+        assertEquals("{\"boolean2\":false,\"boolean1\":true}", buffer.getVolatileParams().get(key).getValues().get(0).execute());
     }
 
     @Test
@@ -612,116 +677,49 @@ public String execute() {
                 return String.valueOf(DateFormat.format(pattern, System.currentTimeMillis()));
             }
         };
-        tracker = tracker.setParam(key, closure);
-        assertEquals(today, buffer.getVolatileParams().get(0).getValue().execute());
-    }
-
-    @Test
-    public void setParamIntWithOptions() {
-        ParamOption options = new ParamOption().setPersistent(true);
-
-        tracker = tracker.setParam(key, 1, options);
-        assertEquals(0, buffer.getVolatileParams().size());
-        assertEquals("1", buffer.getPersistentParams().get(0).getValue().execute());
-
-    }
+        tracker.setParam(key, closure);
 
-    @Test
-    public void setParamBooleanWithOptions() {
-        ParamOption options = new ParamOption().setPersistent(true);
-        boolean rBoolean = new Random().nextBoolean();
-
-        tracker = tracker.setParam(key, rBoolean, options);
-        assertEquals(0, buffer.getVolatileParams().size());
-        assertTrue(buffer.getPersistentParams().get(0).getOptions().isPersistent());
-        assertEquals(String.valueOf(rBoolean), buffer.getPersistentParams().get(0).getValue().execute());
-
-    }
-
-    @Test
-    public void setParamFloatWithOptions() {
-        ParamOption options = new ParamOption().setRelativePosition(ParamOption.RelativePosition.first);
-        tracker = tracker.setParam(key, new Random().nextFloat(), options);
+        assertEquals(1, buffer.getVolatileParams().size());
         assertEquals(0, buffer.getPersistentParams().size());
-        assertEquals(ParamOption.RelativePosition.first, buffer.getVolatileParams().get(0).getOptions().getRelativePosition());
-    }
-
-    @Test
-    public void setParamDoubleWithOptions() {
-        ParamOption options = new ParamOption().setRelativePosition(ParamOption.RelativePosition.last);
 
-        tracker = tracker.setParam(key, 1.0, options);
-        assertEquals(0, buffer.getPersistentParams().size());
-        assertEquals(ParamOption.RelativePosition.last, buffer.getVolatileParams().get(0).getOptions().getRelativePosition());
+        assertEquals(1, buffer.getVolatileParams().get(key).getValues().size());
+        assertEquals(today, buffer.getVolatileParams().get(key).getValues().get(0).execute());
     }
 
     @Test
-    public void setParamStringWithOptions() {
-        ParamOption options = new ParamOption()
-                .setEncode(true)
-                .setPersistent(true);
+    public void setParamWithOptions() {
+        ParamOption options = new ParamOption().setPersistent(true).setAppend(true);
+        tracker.setParam(key, 1, options);
 
-        tracker = tracker.setParam(key, " encoding ", options);
         assertEquals(0, buffer.getVolatileParams().size());
-        assertTrue(buffer.getPersistentParams().get(0).getOptions().isEncode() && buffer.getPersistentParams().get(0).getOptions().isPersistent());
-    }
+        assertEquals(1, buffer.getPersistentParams().size());
 
-    @Test
-    public void setParamArrayWithOptionsTest() {
-        ParamOption options = new ParamOption().setSeparator("_");
-        ArrayList<Integer> array = new ArrayList<Integer>() {{
-            add(1);
-            add(2);
-            add(3);
-        }};
+        assertEquals(1, buffer.getPersistentParams().get(key).getValues().size());
+        assertEquals(true, buffer.getPersistentParams().get(key).getOptions().isAppend());
+        assertEquals("1", buffer.getPersistentParams().get(key).getValues().get(0).execute());
 
-        tracker = tracker.setParam(key, array, options);
-        assertEquals(0, buffer.getPersistentParams().size());
-        assertEquals("_", buffer.getVolatileParams().get(0).getOptions().getSeparator());
     }
 
     @Test
-    public void setParamTabWithOptionsTest() {
-        Float[] tab = new Float[]{1.f, 2.f};
+    public void setParamComplex() {
+        ParamOption options = new ParamOption().setPersistent(true).setAppend(true);
+        tracker.setParam(key, 1)
+                .setParam(key, "test");
+        tracker.setParam(key, 1, options)
+                .setParam(key, 67, options);
 
-        ParamOption options = new ParamOption()
-                .setSeparator("///");
-        tracker = tracker.setParam(key, tab, options);
-        assertEquals(0, buffer.getPersistentParams().size());
-        assertEquals("///", buffer.getVolatileParams().get(0).getOptions().getSeparator());
-    }
+        assertEquals(1, buffer.getVolatileParams().size());
+        assertEquals(1, buffer.getPersistentParams().size());
 
-    @Test
-    public void setParamMapWithOptionsTest() {
-        LinkedHashMap<String, Boolean> map = new LinkedHashMap<String, Boolean>() {{
-            put("boolean1", true);
-            put("boolean2", false);
-        }};
-
-        ParamOption options = new ParamOption()
-                .setRelativePosition(ParamOption.RelativePosition.before)
-                .setRelativeParameterKey("REFKEY");
-        tracker = tracker.setParam(key, map, options);
-
-        ParamOption paramOptions = buffer.getVolatileParams().get(0).getOptions();
-        assertTrue(paramOptions.getRelativePosition() == ParamOption.RelativePosition.before);
-        assertEquals("REFKEY", paramOptions.getRelativeParameterKey());
-    }
-
-    @Test
-    public void setParamClosureWithOptionsTest() {
-        ParamOption options = new ParamOption().setEncode(true);
-        final int count = 2;
-        Closure closure = new Closure() {
-            @Override
-            public String execute() {
-                return String.valueOf(count * 2);
-            }
-        };
+        assertEquals(3, buffer.getVolatileParams().get(key).getValues().size());
+        assertEquals("test", buffer.getVolatileParams().get(key).getValues().get(0).execute());
+        assertEquals("1", buffer.getVolatileParams().get(key).getValues().get(1).execute());
+        assertEquals("67", buffer.getVolatileParams().get(key).getValues().get(2).execute());
 
-        tracker = tracker.setParam(key, closure, options);
-        assertTrue(buffer.getVolatileParams().get(0).getOptions().isEncode());
-        assertEquals("4", buffer.getVolatileParams().get(0).getValue().execute());
+        assertEquals(2, buffer.getPersistentParams().get(key).getValues().size());
+        assertEquals(true, buffer.getPersistentParams().get(key).getOptions().isAppend());
+        assertEquals("1", buffer.getPersistentParams().get(key).getValues().get(0).execute());
+        assertEquals("67", buffer.getPersistentParams().get(key).getValues().get(1).execute());
     }
 
     @Test
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/VideoTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/VideoTest.java
index f1e649ef..5711eed2 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/VideoTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/VideoTest.java
@@ -28,19 +28,16 @@ of this software and associated documentation files (the "Software"), to deal
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-import java.util.Random;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertNull;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class VideoTest extends AbstractTestClass {
 
     private Video video;
-    private Buffer buffer;
     private MediaPlayer player;
 
     @Before
@@ -48,7 +45,6 @@ public void setUp() throws Exception {
         super.setUp();
         player = new MediaPlayer(tracker);
         video = new Video(player);
-        buffer = tracker.getBuffer();
     }
 
     @Test
@@ -69,164 +65,143 @@ public void multiInstancesTest() {
         assertNotSame(video, new Video(player));
     }
 
-    @Test
-    public void setTest() {
-        boolean rBoolean = new Random().nextBoolean();
-        int id = new Random().nextInt(500);
-
-        assertEquals("name", video.setName("name").getName());
-        assertEquals("test" + id, video.setWebDomain("test" + id).getWebDomain());
-        assertEquals(3, video.setDuration(3).getDuration());
-        assertEquals(RichMedia.Action.Stop, video.setAction(RichMedia.Action.Stop).getAction());
-        assertEquals(rBoolean, video.setBuffering(rBoolean).isBuffering());
-        assertEquals(rBoolean, video.setEmbedded(rBoolean).isEmbedded());
-        assertEquals(3, video.setLevel2(3).getLevel2());
-    }
-
     @Test
     public void setEventPlayTest() {
         video.setDuration(56)
                 .setAction(RichMedia.Action.Play)
+                .setLevel2(4)
                 .setName("name")
-                .setLevel2(6)
                 .setChapter1("chapter1")
                 .setEvent();
         assertEquals(8, buffer.getVolatileParams().size());
-        int i = 0;
 
-        assertEquals("type", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("video", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("video", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("chapter1::name", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("chapter1::name", buffer.getVolatileParams().get("p").getValues().get(0).execute());
 
-        assertEquals("a", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("play", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("a").getValues().size());
+        assertEquals("play", buffer.getVolatileParams().get("a").getValues().get(0).execute());
 
-        assertEquals("m6", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("clip", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m6").getValues().size());
+        assertEquals("clip", buffer.getVolatileParams().get("m6").getValues().get(0).execute());
 
-        assertEquals("plyr", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("1", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("plyr").getValues().size());
+        assertEquals("1", buffer.getVolatileParams().get("plyr").getValues().get(0).execute());
 
-        assertEquals("m5", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("int", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m5").getValues().size());
+        assertEquals("int", buffer.getVolatileParams().get("m5").getValues().get(0).execute());
 
-        assertEquals("s2", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("6", buffer.getVolatileParams().get(i++).getValue().execute());
-
-        assertEquals("m1", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("56", buffer.getVolatileParams().get(i).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("s2").getValues().size());
+        assertEquals("4", buffer.getVolatileParams().get("s2").getValues().get(0).execute());
 
+        assertEquals(1, buffer.getVolatileParams().get("m1").getValues().size());
+        assertEquals("56", buffer.getVolatileParams().get("m1").getValues().get(0).execute());
     }
 
     @Test
     public void setEventRefreshTest() {
         video.setDuration(56)
                 .setAction(RichMedia.Action.Refresh)
+                .setLevel2(4)
                 .setName("name")
-                .setLevel2(6)
                 .setChapter1("chapter1")
                 .setEvent();
         assertEquals(8, buffer.getVolatileParams().size());
-        int i = 0;
-
-        assertEquals("type", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("video", buffer.getVolatileParams().get(i++).getValue().execute());
-
-        assertEquals("p", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("chapter1::name", buffer.getVolatileParams().get(i++).getValue().execute());
 
-        assertEquals("a", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("refresh", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("video", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("m6", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("clip", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("chapter1::name", buffer.getVolatileParams().get("p").getValues().get(0).execute());
 
-        assertEquals("plyr", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("1", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("a").getValues().size());
+        assertEquals("refresh", buffer.getVolatileParams().get("a").getValues().get(0).execute());
 
-        assertEquals("m5", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("int", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m6").getValues().size());
+        assertEquals("clip", buffer.getVolatileParams().get("m6").getValues().get(0).execute());
 
-        assertEquals("s2", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("6", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("plyr").getValues().size());
+        assertEquals("1", buffer.getVolatileParams().get("plyr").getValues().get(0).execute());
 
-        assertEquals("m1", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("56", buffer.getVolatileParams().get(i).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m5").getValues().size());
+        assertEquals("int", buffer.getVolatileParams().get("m5").getValues().get(0).execute());
 
+        assertEquals(1, buffer.getVolatileParams().get("s2").getValues().size());
+        assertEquals("4", buffer.getVolatileParams().get("s2").getValues().get(0).execute());
 
+        assertEquals(1, buffer.getVolatileParams().get("m1").getValues().size());
+        assertEquals("56", buffer.getVolatileParams().get("m1").getValues().get(0).execute());
     }
 
     @Test
     public void setEventPauseTest() {
         video.setDuration(56)
                 .setAction(RichMedia.Action.Pause)
+                .setLevel2(4)
                 .setName("name")
-                .setLevel2(6)
                 .setChapter1("chapter1")
                 .setEvent();
         assertEquals(8, buffer.getVolatileParams().size());
-        int i = 0;
 
-        assertEquals("type", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("video", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("video", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("chapter1::name", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("chapter1::name", buffer.getVolatileParams().get("p").getValues().get(0).execute());
 
-        assertEquals("a", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("pause", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("a").getValues().size());
+        assertEquals("pause", buffer.getVolatileParams().get("a").getValues().get(0).execute());
 
-        assertEquals("m6", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("clip", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m6").getValues().size());
+        assertEquals("clip", buffer.getVolatileParams().get("m6").getValues().get(0).execute());
 
-        assertEquals("plyr", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("1", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("plyr").getValues().size());
+        assertEquals("1", buffer.getVolatileParams().get("plyr").getValues().get(0).execute());
 
-        assertEquals("m5", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("int", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m5").getValues().size());
+        assertEquals("int", buffer.getVolatileParams().get("m5").getValues().get(0).execute());
 
-        assertEquals("s2", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("6", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("s2").getValues().size());
+        assertEquals("4", buffer.getVolatileParams().get("s2").getValues().get(0).execute());
 
-        assertEquals("m1", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("56", buffer.getVolatileParams().get(i).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m1").getValues().size());
+        assertEquals("56", buffer.getVolatileParams().get("m1").getValues().get(0).execute());
     }
 
     @Test
     public void setEventStopTest() {
         video.setDuration(56)
                 .setAction(RichMedia.Action.Stop)
+                .setLevel2(4)
                 .setName("name")
-                .setLevel2(6)
                 .setChapter1("chapter1")
                 .setEvent();
         assertEquals(8, buffer.getVolatileParams().size());
-        int i = 0;
 
-        assertEquals("type", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("video", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("type").getValues().size());
+        assertEquals("video", buffer.getVolatileParams().get("type").getValues().get(0).execute());
 
-        assertEquals("p", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("chapter1::name", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("p").getValues().size());
+        assertEquals("chapter1::name", buffer.getVolatileParams().get("p").getValues().get(0).execute());
 
-        assertEquals("a", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("stop", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("a").getValues().size());
+        assertEquals("stop", buffer.getVolatileParams().get("a").getValues().get(0).execute());
 
-        assertEquals("m6", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("clip", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m6").getValues().size());
+        assertEquals("clip", buffer.getVolatileParams().get("m6").getValues().get(0).execute());
 
-        assertEquals("plyr", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("1", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("plyr").getValues().size());
+        assertEquals("1", buffer.getVolatileParams().get("plyr").getValues().get(0).execute());
 
-        assertEquals("m5", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("int", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m5").getValues().size());
+        assertEquals("int", buffer.getVolatileParams().get("m5").getValues().get(0).execute());
 
-        assertEquals("s2", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("6", buffer.getVolatileParams().get(i++).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("s2").getValues().size());
+        assertEquals("4", buffer.getVolatileParams().get("s2").getValues().get(0).execute());
 
-        assertEquals("m1", buffer.getVolatileParams().get(i).getKey());
-        assertEquals("56", buffer.getVolatileParams().get(i).getValue().execute());
+        assertEquals(1, buffer.getVolatileParams().get("m1").getValues().size());
+        assertEquals("56", buffer.getVolatileParams().get("m1").getValues().get(0).execute());
     }
 }
diff --git a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/VideosTest.java b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/VideosTest.java
index 0fdf8962..acb109d6 100644
--- a/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/VideosTest.java
+++ b/ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/VideosTest.java
@@ -35,7 +35,7 @@ of this software and associated documentation files (the "Software"), to deal
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class VideosTest extends AbstractTestClass {
 
@@ -58,46 +58,24 @@ public void addOneTest() {
         videos.add("name", 80);
         videos.add("name", 89);
         assertEquals(1, videos.list.size());
-        assertEquals("name", videos.list.get(0).getName());
-        assertEquals(80, videos.list.get(0).getDuration());
     }
 
     @Test
     public void addTwoTest() {
         videos.add("name", "chapter1", 80);
         assertEquals(1, videos.list.size());
-        assertEquals("name", videos.list.get(0).getName());
-        assertEquals("chapter1", videos.list.get(0).getChapter1());
-        assertEquals(80, videos.list.get(0).getDuration());
     }
 
     @Test
     public void addThreeTest() {
         videos.add("name", "chapter1", "chapter2", 80);
         assertEquals(1, videos.list.size());
-        assertEquals("name", videos.list.get(0).getName());
-        assertEquals("chapter1", videos.list.get(0).getChapter1());
-        assertEquals("chapter2", videos.list.get(0).getChapter2());
-        assertEquals(80, videos.list.get(0).getDuration());
     }
 
     @Test
     public void addFourTest() {
-        Random r = new Random();
-        int[] vals = {r.nextInt(500), r.nextInt(500), r.nextInt(500), r.nextInt(500), r.nextInt(500)};
-        int i = 0;
-
-        Video v = videos.add("name" + vals[i++], "chapter" + vals[i++], "chapter" + vals[i++], "chapter" + vals[i++], vals[i]);
-
-        assertNotNull(v.getId());
-
-        i = 0;
+        videos.add("name", "chapter1", "chapter2", "chapter3", 10);
         assertEquals(1, videos.list.size());
-        assertEquals("name" + vals[i++], videos.list.get(0).getName());
-        assertEquals("chapter" + vals[i++], videos.list.get(0).getChapter1());
-        assertEquals("chapter" + vals[i++], videos.list.get(0).getChapter2());
-        assertEquals("chapter" + vals[i++], videos.list.get(0).getChapter3());
-        assertEquals(vals[i], videos.list.get(0).getDuration());
     }
 
     @Test
diff --git a/ATMobileAnalytics/Tracker/tvtracking.manifest.json b/ATMobileAnalytics/Tracker/tvtracking.manifest.json
new file mode 100755
index 00000000..ccc20796
--- /dev/null
+++ b/ATMobileAnalytics/Tracker/tvtracking.manifest.json
@@ -0,0 +1,31 @@
+{
+  "name": "Geode_Tag_Plg_TVT",
+  "description": "Plugin permettant de récupérer les informations liées au TV Tracking",
+  "type": "sdkplugins",
+  "config": {
+    "tvtURL": {
+      "title": "Geode_Tag_SDK_Plg_TVT_tvtUrl_Title",
+      "description": "Geode_Tag_SDK_Plg_TVT_tvtUrl_Description",
+      "defaultValue": "",
+      "type": "string",
+      "public": true,
+      "global": true
+    },
+    "tvtVisitDuration": {
+      "title": "Geode_Tag_SDK_Plg_TVT_tvtVisitDuration_Title",
+      "description": "Geode_Tag_SDK_Plg_TVT_tvtVisitDuration_Description",
+      "defaultValue": "10",
+      "type": "int",
+      "public": true,
+      "global": true
+    },
+    "tvtSpotValidityTime": {
+      "title": "Geode_Tag_SDK_Plg_TVT_tvtSpotValidityTime_Title",
+      "description": "Geode_Tag_SDK_Plg_TVT_tvtSpotValidityTime_Description",
+      "defaultValue": "5",
+      "type": "int",
+      "public": true,
+      "global": true
+    }
+  }
+}
\ No newline at end of file
diff --git a/ATMobileAnalytics/build.gradle b/ATMobileAnalytics/build.gradle
index 025ac3c9..5f5e165a 100644
--- a/ATMobileAnalytics/build.gradle
+++ b/ATMobileAnalytics/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7'
     }
@@ -15,4 +15,4 @@ allprojects {
     repositories {
         jcenter()
     }
-}
+}
\ No newline at end of file
diff --git a/ATMobileAnalytics/defaultConfiguration.json b/ATMobileAnalytics/defaultConfiguration.json
deleted file mode 100644
index 0e2daed6..00000000
--- a/ATMobileAnalytics/defaultConfiguration.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "phone": {
-    "log": "logp",
-    "logSSL": "logs",
-    "domain": "xiti.com",
-    "site": 552987,
-    "storageduration": 4,
-    "storage": "never",
-    "plugins": "",
-    "secure": false,
-    "identifier": "androidId",
-    "hashUserId": false,
-    "pixelPath": "/hit.xiti",
-    "persistIdentifiedVisitor": true,
-    "tvtURL": "",
-    "tvtVisitDuration": 10,
-    "tvtSpotValidityTime": 5,
-    "enableCrashDetection": true,
-    "campaignLastPersistence": true,
-    "campaignLifetime": 30,
-    "sessionBackgroundDuration": 60,
-    "downloadSource": "int"
-  },
-  "tablet": {
-    "log": "logp",
-    "logSSL": "logs",
-    "domain": "xiti.com",
-    "site": 552987,
-    "storageduration": 4,
-    "storage": "never",
-    "plugins": "",
-    "secure": false,
-    "identifier": "androidId",
-    "hashUserId": false,
-    "pixelPath": "/hit.xiti",
-    "persistIdentifiedVisitor": true,
-    "tvtURL": "",
-    "tvtVisitDuration": 10,
-    "tvtSpotValidityTime": 5,
-    "enableCrashDetection": true,
-    "campaignLastPersistence": true,
-    "campaignLifetime": 30,
-    "sessionBackgroundDuration": 60,
-    "downloadSource": "int"
-  }
-}
\ No newline at end of file
diff --git a/ATMobileAnalytics/gradle/wrapper/gradle-wrapper.properties b/ATMobileAnalytics/gradle/wrapper/gradle-wrapper.properties
index 19f2556a..71f1170a 100644
--- a/ATMobileAnalytics/gradle/wrapper/gradle-wrapper.properties
+++ b/ATMobileAnalytics/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,10 @@
-#Thu Aug 25 14:36:39 CEST 2016
+<<<<<<< HEAD
+#Fri Mar 24 11:31:59 CET 2017
+=======
+#Tue Mar 07 09:21:00 CET 2017
+>>>>>>> smartSDK
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/DeliveryProject/Gruntfile.js b/DeliveryProject/Gruntfile.js
deleted file mode 100644
index d19cc291..00000000
--- a/DeliveryProject/Gruntfile.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * Created by rsalazard on 03/03/15.
- */
-
-module.exports = function (grunt) {
-    var alphaVersion = grunt.file.readJSON('core.manifest.json').version + 'a';
-    var prodVersion = grunt.file.readJSON('core.manifest.json').version;
-
-    function getVersion() {
-        grunt.file.write('../version.txt', prodVersion);
-    }
-
-    // Project configuration.
-    grunt.initConfig({
-        /*
-         * Delete work directories
-         */
-        clean: {
-            all: ['delivery']
-        },
-        copy: {
-            alphaPackage: {
-                expand: true,
-                cwd: '../ATMobileAnalytics/Tracker/build/intermediates/bundles/release',
-                src: '**',
-                dest: 'delivery/' + alphaVersion + '/Tracker.aar'
-            },
-            alphaRes: {
-                expand: true,
-                flatten: true,
-                src: ['../ATMobileAnalytics/Tracker/src/main/assets/defaultConfiguration.json', 'index.html', '*.json'],
-                dest: 'delivery/' + alphaVersion
-            },
-            prodPackage: {
-                expand: true,
-                cwd: '../ATMobileAnalytics/Tracker/build/intermediates/bundles/release',
-                src: '**',
-                dest: 'delivery/' + prodVersion + '/Tracker.aar'
-            },
-            prodRes: {
-                expand: true,
-                flatten: true,
-                src: ['../ATMobileAnalytics/Tracker/src/main/assets/defaultConfiguration.json', 'index.html', '*.json'],
-                dest: 'delivery/' + prodVersion
-            }
-        }
-    });
-
-    // These plugins provide necessary tasks.
-    grunt.loadNpmTasks('grunt-contrib-clean');
-    grunt.loadNpmTasks('grunt-contrib-copy');
-    grunt.registerTask('alphaDelivery', ['clean:all', 'copy:alphaPackage', 'copy:alphaRes']);
-    grunt.registerTask('prodDelivery', ['clean:all', 'copy:prodPackage', 'copy:prodRes']);
-    grunt.registerTask('getVersion', getVersion);
-};
diff --git a/DeliveryProject/core.manifest.json b/DeliveryProject/core.manifest.json
deleted file mode 100644
index d6f069ad..00000000
--- a/DeliveryProject/core.manifest.json
+++ /dev/null
@@ -1,143 +0,0 @@
-{
-    "name":"Core",
-    "description": "Geode_Tag_Android_Description",
-    "version": "2.3.4",
-    "type": "core",
-    "config": {
-        "storage":
-        {
-            "title": "Geode_Tag_SDK_Config_Title_storage",
-            "description": "Geode_Tag_SDK_Config_Description_storage",
-            "defaultValue": "required",
-            "type": "string",
-            "public": true,
-            "global": true
-        },
-        "plugins":
-        {
-            "title": "plugins",
-            "description": "",
-            "defaultValue": "",
-            "type": "string",
-            "public": true,
-            "global": true
-        },
-        "log":
-        {
-            "title": "Geode_Tag_SDK_Config_Title_log",
-            "description": "",
-            "defaultValue": "",
-            "type": "string",
-            "public": true,
-            "global": true
-        },
-        "logSSL":
-        {
-            "title": "Geode_Tag_SDK_Config_Title_logSSL",
-            "description": "",
-            "defaultValue": "",
-            "type": "string",
-            "public": true,
-            "global": true
-        },
-        "domain":
-        {
-            "title": "Geode_Tag_SDK_Config_Title_domain",
-            "description": "",
-            "defaultValue": "xiti.com",
-            "type": "string",
-            "public": true,
-            "global": true
-        },
-        "pixelPath":
-        {
-            "title": "Geode_Tag_SDK_Config_Title_pixelPath",
-            "description": "",
-            "defaultValue": "/hit.xiti",
-            "type": "string",
-            "public": true,
-            "global": true
-        },
-        "site":
-        {
-            "title": "Geode_Tag_SDK_Config_Title_site",
-            "description": "Geode_Tag_SDK_Config_Description_site",
-            "defaultValue": "0",
-            "type": "int",
-            "public": true,
-            "global": true
-        },
-        "secure":
-        {
-            "title": "Geode_Tag_SDK_Config_Title_secure",
-            "description": "Geode_Tag_SDK_Config_Description_secure",
-            "defaultValue": "false",
-            "type": "bool",
-            "public": true,
-            "global": true
-        },
-        "hashUserId":
-        {
-            "title": "Geode_Tag_SDK_Config_Title_hashUserId",
-            "description": "Geode_Tag_SDK_Config_Description_hashUserId",
-            "defaultValue": "false",
-            "type": "bool",
-            "public": true,
-            "global": true
-        },
-        "identifier":
-        {
-            "title": "Geode_Tag_SDK_Config_Title_identifier",
-            "description": "Geode_Tag_SDK_Config_Description_identifier_Android",
-            "defaultValue": "androidId",
-            "type": "string",
-            "public": true,
-            "global": true
-        },
-        "persistIdentifiedVisitor":
-        {
-            "title": "Geode_Tag_SDK_Config_Title_persistIdentifiedVisitor",
-            "description": "Geode_Tag_SDK_Config_Description_persistIdentifiedVisitor",
-            "defaultValue": "true",
-            "type": "bool",
-            "public": true,
-            "global": true
-        },
-        "enableCrashDetection":
-        {
-            "title": "Geode_Tag_SDK_Config_Title_enableCrashDetection",
-            "description": "Geode_Tag_SDK_Config_Description_enableCrashDetection",
-            "defaultValue": "true",
-            "type": "bool",
-            "public": true,
-            "global": true
-        },
-        "campaignLifetime":
-        {
-            "title": "Geode_Tag_SDK_Config_Title_lifetime",
-            "description": "Geode_Tag_SDK_Config_Description_lifetime",
-            "defaultValue": "30",
-            "type": "int",
-            "public": true,
-            "global": true
-        },
-        "campaignLastPersistence":
-        {
-            "title": "Geode_Tag_SDK_Config_Title_campaignLastPersistence",
-            "description": "Geode_Tag_SDK_Config_Description_campaignLastPersistence",
-            "defaultValue": "true",
-            "type": "bool",
-            "public": true,
-            "global": true
-        },
-        "sessionBackgroundDuration":
-        {
-            "title": "Geode_Tag_SDK_Config_Title_sessionBackgroundDuration",
-            "description": "Geode_Tag_SDK_Config_Description_sessionBackgroundDuration",
-            "defaultValue": "60",
-            "type": "int",
-            "public": true,
-            "global": true
-        }
-    }
-}
diff --git a/DeliveryProject/defaultConfiguration.json b/DeliveryProject/defaultConfiguration.json
deleted file mode 100644
index 5f3ff28f..00000000
--- a/DeliveryProject/defaultConfiguration.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "phone": {
-    "log": "logp",
-    "logSSL": "logsPhone",
-    "domain": "xiti.com",
-    "site": 123,
-    "storageduration": 4,
-    "storage": "required",
-    "plugins": "nuggad,tvtracking",
-    "secure": false,
-    "identifier": "androidId",
-    "hashUserId": false,
-    "pixelPath": "/hit.xiti",
-    "persistIdentifiedVisitor": false,
-    "tvtURL": "test.com",
-    "tvtVisitDuration": 12,
-    "tvtSpotValidityTime": 5,
-    "enableCrashDetection": true,
-    "campaignLastPersistence": true,
-    "campaignLifetime": 10,
-    "sessionBackgroundDuration": 60,
-    "downloadSource": "int"
-  },
-  "tablet": {
-    "log": "logTablet",
-    "logSSL": "logsTablet",
-    "domain": "xiti.com",
-    "site": 456,
-    "storageduration": 4,
-    "storage": "required",
-    "plugins": "nuggad,tvtracking",
-    "secure": false,
-    "identifier": "androidId",
-    "hashUserId": false,
-    "pixelPath": "/hit.xiti",
-    "persistIdentifiedVisitor": false,
-    "tvtURL": "test.com",
-    "tvtVisitDuration": 12,
-    "tvtSpotValidityTime": 5,
-    "enableCrashDetection": true,
-    "campaignLastPersistence": true,
-    "campaignLifetime": 10,
-    "sessionBackgroundDuration": 60,
-    "downloadSource": "int"
-  }
-}
diff --git a/DeliveryProject/nuggad.manifest.json b/DeliveryProject/nuggad.manifest.json
deleted file mode 100755
index dda7ff9f..00000000
--- a/DeliveryProject/nuggad.manifest.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "name":"Geode_Tag_Plg_NuggAd",
-    "description": "Plugin permettant de récupérer les informations liées à NuggAd",
-	"type": "sdkplugins",
-	"config": {}
-}
\ No newline at end of file
diff --git a/DeliveryProject/package.json b/DeliveryProject/package.json
deleted file mode 100644
index e30e12cb..00000000
--- a/DeliveryProject/package.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"name": "AndroidSDKFire",
-	"version": "1.0.0",
-	"description": "Projet de livraison du SDK Android pour TagComposer",
-	"author": "Nicolas Sagnette",
-	"private": "true",
-	"repository": {
-		"type": "git",
-		"url": "http://git.intraxiti.com/Tag/Android-V2-Tracker.git"
-	},
-	"dependencies": {
-		"grunt": "^1.0.1",
-		"grunt-contrib-clean": "^1.0.0",
-		"grunt-contrib-copy": "^1.0.0"
-	}
-}
\ No newline at end of file
diff --git a/DeliveryProject/tvtracking.manifest.json b/DeliveryProject/tvtracking.manifest.json
deleted file mode 100755
index 1c205f58..00000000
--- a/DeliveryProject/tvtracking.manifest.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    "name":"Geode_Tag_Plg_TVT",
-    "description": "Plugin permettant de récupérer les informations liées au TV Tracking",
-    "type": "sdkplugins",
-    "config": {
-        "tvtURL": {
-        "title": "Geode_Tag_SDK_Plg_TVT_tvtUrl_Title",
-        "description": "Geode_Tag_SDK_Plg_TVT_tvtUrl_Description",
-        "defaultValue": "",
-        "type": "string",
-        "public": true,
-        "global": true
-      },
-      "tvtVisitDuration": {
-        "title": "Geode_Tag_SDK_Plg_TVT_tvtVisitDuration_Title",
-        "description": "Geode_Tag_SDK_Plg_TVT_tvtVisitDuration_Description",
-        "defaultValue": "10",
-        "type": "int",
-        "public": true,
-        "global": true
-      },
-      "tvtSpotValidityTime": {
-        "title": "Geode_Tag_SDK_Plg_TVT_tvtSpotValidityTime_Title",
-        "description": "Geode_Tag_SDK_Plg_TVT_tvtSpotValidityTime_Description",
-        "defaultValue": "5",
-        "type": "int",
-        "public": true,
-        "global": true
-      }
-    }
-}
\ No newline at end of file
diff --git a/Doxygen/Doxyfile_Android b/Doxygen/Doxyfile_Android
deleted file mode 100644
index f2bd0f8c..00000000
--- a/Doxygen/Doxyfile_Android
+++ /dev/null
@@ -1,363 +0,0 @@
-# Doxyfile 1.8.8
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-DOXYFILE_ENCODING      = UTF-8
-PROJECT_NAME           = Tracker
-PROJECT_NUMBER         = 2.3.0
-PROJECT_BRIEF          = "Documentation to use Tracker Android SDK implementation"
-PROJECT_LOGO           = at_logo.png
-OUTPUT_DIRECTORY       = ../Documentation
-CREATE_SUBDIRS         = NO
-ALLOW_UNICODE_NAMES    = NO
-OUTPUT_LANGUAGE        = English
-BRIEF_MEMBER_DESC      = YES
-REPEAT_BRIEF           = YES
-ABBREVIATE_BRIEF       = "The $name class" \
-                         "The $name widget" \
-                         "The $name file" \
-                         is \
-                         provides \
-                         specifies \
-                         contains \
-                         represents \
-                         a \
-                         an \
-                         the
-ALWAYS_DETAILED_SEC    = NO
-INLINE_INHERITED_MEMB  = NO
-FULL_PATH_NAMES        = NO
-STRIP_FROM_PATH        = 
-STRIP_FROM_INC_PATH    = 
-SHORT_NAMES            = NO
-JAVADOC_AUTOBRIEF      = NO
-QT_AUTOBRIEF           = NO
-MULTILINE_CPP_IS_BRIEF = NO
-INHERIT_DOCS           = YES
-SEPARATE_MEMBER_PAGES  = NO
-TAB_SIZE               = 4
-ALIASES                = 
-TCL_SUBST              = 
-OPTIMIZE_OUTPUT_FOR_C  = NO
-OPTIMIZE_OUTPUT_JAVA   = YES
-OPTIMIZE_FOR_FORTRAN   = NO
-OPTIMIZE_OUTPUT_VHDL   = NO
-EXTENSION_MAPPING      = 
-MARKDOWN_SUPPORT       = YES
-AUTOLINK_SUPPORT       = YES
-BUILTIN_STL_SUPPORT    = NO
-CPP_CLI_SUPPORT        = NO
-SIP_SUPPORT            = NO
-IDL_PROPERTY_SUPPORT   = YES
-DISTRIBUTE_GROUP_DOC   = NO
-SUBGROUPING            = YES
-INLINE_GROUPED_CLASSES = NO
-INLINE_SIMPLE_STRUCTS  = NO
-TYPEDEF_HIDES_STRUCT   = NO
-LOOKUP_CACHE_SIZE      = 0
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-EXTRACT_ALL            = NO
-EXTRACT_PRIVATE        = NO
-EXTRACT_PACKAGE        = NO
-EXTRACT_STATIC         = NO
-EXTRACT_LOCAL_CLASSES  = NO
-EXTRACT_LOCAL_METHODS  = NO
-EXTRACT_ANON_NSPACES   = NO
-HIDE_UNDOC_MEMBERS     = NO
-HIDE_UNDOC_CLASSES     = NO
-HIDE_FRIEND_COMPOUNDS  = NO
-HIDE_IN_BODY_DOCS      = NO
-INTERNAL_DOCS          = NO
-CASE_SENSE_NAMES       = NO
-HIDE_SCOPE_NAMES       = NO
-SHOW_INCLUDE_FILES     = YES
-SHOW_GROUPED_MEMB_INC  = NO
-FORCE_LOCAL_INCLUDES   = NO
-INLINE_INFO            = YES
-SORT_MEMBER_DOCS       = YES
-SORT_BRIEF_DOCS        = NO
-SORT_MEMBERS_CTORS_1ST = NO
-SORT_GROUP_NAMES       = NO
-SORT_BY_SCOPE_NAME     = NO
-STRICT_PROTO_MATCHING  = NO
-GENERATE_TODOLIST      = NO
-GENERATE_TESTLIST      = YES
-GENERATE_BUGLIST       = YES
-GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS       = 
-MAX_INITIALIZER_LINES  = 30
-SHOW_USED_FILES        = YES
-SHOW_FILES             = YES
-SHOW_NAMESPACES        = NO
-FILE_VERSION_FILTER    = 
-LAYOUT_FILE            = 
-CITE_BIB_FILES         = 
-#---------------------------------------------------------------------------
-# Configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET                  = NO
-WARNINGS               = YES
-WARN_IF_UNDOCUMENTED   = YES
-WARN_IF_DOC_ERROR      = YES
-WARN_NO_PARAMDOC       = NO
-WARN_FORMAT            = "$file:$line: $text"
-WARN_LOGFILE           = 
-#---------------------------------------------------------------------------
-# Configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT                  = ../ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker
-INPUT_ENCODING         = UTF-8
-FILE_PATTERNS          = *.c \
-                         *.cc \
-                         *.cxx \
-                         *.cpp \
-                         *.c++ \
-                         *.java \
-                         *.ii \
-                         *.ixx \
-                         *.ipp \
-                         *.i++ \
-                         *.inl \
-                         *.idl \
-                         *.ddl \
-                         *.odl \
-                         *.h \
-                         *.hh \
-                         *.hxx \
-                         *.hpp \
-                         *.h++ \
-                         *.cs \
-                         *.d \
-                         *.php \
-                         *.php4 \
-                         *.php5 \
-                         *.phtml \
-                         *.inc \
-                         *.m \
-                         *.markdown \
-                         *.md \
-                         *.mm \
-                         *.dox \
-                         *.py \
-                         *.f90 \
-                         *.f \
-                         *.for \
-                         *.tcl \
-                         *.vhd \
-                         *.vhdl \
-                         *.ucf \
-                         *.qsf \
-                         *.as \
-                         *.js
-RECURSIVE              = YES
-EXCLUDE                = 
-EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = 
-EXCLUDE_SYMBOLS        = 
-EXAMPLE_PATH           = 
-EXAMPLE_PATTERNS       = *
-EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             = 
-INPUT_FILTER           = 
-FILTER_PATTERNS        = 
-FILTER_SOURCE_FILES    = NO
-FILTER_SOURCE_PATTERNS = 
-USE_MDFILE_AS_MAINPAGE = 
-#---------------------------------------------------------------------------
-# Configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER         = NO
-INLINE_SOURCES         = NO
-STRIP_CODE_COMMENTS    = YES
-REFERENCED_BY_RELATION = NO
-REFERENCES_RELATION    = NO
-REFERENCES_LINK_SOURCE = YES
-SOURCE_TOOLTIPS        = YES
-USE_HTAGS              = NO
-VERBATIM_HEADERS       = YES
-CLANG_ASSISTED_PARSING = NO
-CLANG_OPTIONS          = 
-#---------------------------------------------------------------------------
-# Configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX     = YES
-COLS_IN_ALPHA_INDEX    = 2
-IGNORE_PREFIX          = 
-#---------------------------------------------------------------------------
-# Configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML          = YES
-HTML_OUTPUT            = ./resources
-HTML_FILE_EXTENSION    = .html
-HTML_HEADER            = header.html
-HTML_FOOTER            = footer.html
-HTML_STYLESHEET        = doxygen.css
-HTML_EXTRA_STYLESHEET  = 
-HTML_EXTRA_FILES       = bootstrap.min.css bootstrap.min.js
-HTML_COLORSTYLE_HUE    = 210
-HTML_COLORSTYLE_SAT    = 100
-HTML_COLORSTYLE_GAMMA  = 80
-HTML_TIMESTAMP         = YES
-HTML_DYNAMIC_SECTIONS  = NO
-HTML_INDEX_NUM_ENTRIES = 100
-GENERATE_DOCSET        = NO
-DOCSET_FEEDNAME        = "Doxygen generated docs"
-DOCSET_BUNDLE_ID       = org.doxygen.Project
-DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
-DOCSET_PUBLISHER_NAME  = Publisher
-GENERATE_HTMLHELP      = NO
-CHM_FILE               = 
-HHC_LOCATION           = 
-GENERATE_CHI           = NO
-CHM_INDEX_ENCODING     = 
-BINARY_TOC             = NO
-TOC_EXPAND             = NO
-GENERATE_QHP           = NO
-QCH_FILE               = 
-QHP_NAMESPACE          = org.doxygen.Project
-QHP_VIRTUAL_FOLDER     = doc
-QHP_CUST_FILTER_NAME   = 
-QHP_CUST_FILTER_ATTRS  = 
-QHP_SECT_FILTER_ATTRS  = 
-QHG_LOCATION           = 
-GENERATE_ECLIPSEHELP   = NO
-ECLIPSE_DOC_ID         = org.doxygen.Project
-DISABLE_INDEX          = NO
-GENERATE_TREEVIEW      = NO
-ENUM_VALUES_PER_LINE   = 4
-TREEVIEW_WIDTH         = 250
-EXT_LINKS_IN_WINDOW    = NO
-FORMULA_FONTSIZE       = 10
-FORMULA_TRANSPARENT    = YES
-USE_MATHJAX            = NO
-MATHJAX_FORMAT         = HTML-CSS
-MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
-MATHJAX_EXTENSIONS     = 
-MATHJAX_CODEFILE       = 
-SEARCHENGINE           = NO
-SERVER_BASED_SEARCH    = NO
-EXTERNAL_SEARCH        = NO
-SEARCHENGINE_URL       = 
-SEARCHDATA_FILE        = searchdata.xml
-EXTERNAL_SEARCH_ID     = 
-EXTRA_SEARCH_MAPPINGS  = 
-#---------------------------------------------------------------------------
-# Configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX         = NO
-LATEX_OUTPUT           = latex
-LATEX_CMD_NAME         = latex
-MAKEINDEX_CMD_NAME     = makeindex
-COMPACT_LATEX          = NO
-PAPER_TYPE             = a4
-EXTRA_PACKAGES         = 
-LATEX_HEADER           = 
-LATEX_FOOTER           = 
-LATEX_EXTRA_FILES      = 
-PDF_HYPERLINKS         = YES
-USE_PDFLATEX           = YES
-LATEX_BATCHMODE        = NO
-LATEX_HIDE_INDICES     = NO
-LATEX_SOURCE_CODE      = NO
-LATEX_BIB_STYLE        = plain
-#---------------------------------------------------------------------------
-# Configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF           = NO
-RTF_OUTPUT             = rtf
-COMPACT_RTF            = NO
-RTF_HYPERLINKS         = NO
-RTF_STYLESHEET_FILE    = 
-RTF_EXTENSIONS_FILE    = 
-#---------------------------------------------------------------------------
-# Configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN           = NO
-MAN_OUTPUT             = man
-MAN_EXTENSION          = .3
-MAN_SUBDIR             = 
-MAN_LINKS              = NO
-#---------------------------------------------------------------------------
-# Configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML           = NO
-XML_OUTPUT             = xml
-XML_PROGRAMLISTING     = YES
-#---------------------------------------------------------------------------
-# Configuration options related to the DOCBOOK output
-#---------------------------------------------------------------------------
-GENERATE_DOCBOOK       = NO
-DOCBOOK_OUTPUT         = docbook
-DOCBOOK_PROGRAMLISTING = NO
-#---------------------------------------------------------------------------
-# Configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF   = NO
-#---------------------------------------------------------------------------
-# Configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD       = NO
-PERLMOD_LATEX          = NO
-PERLMOD_PRETTY         = YES
-PERLMOD_MAKEVAR_PREFIX = 
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING   = YES
-MACRO_EXPANSION        = NO
-EXPAND_ONLY_PREDEF     = NO
-SEARCH_INCLUDES        = YES
-INCLUDE_PATH           = 
-INCLUDE_FILE_PATTERNS  = 
-PREDEFINED             = 
-EXPAND_AS_DEFINED      = 
-SKIP_FUNCTION_MACROS   = YES
-#---------------------------------------------------------------------------
-# Configuration options related to external references
-#---------------------------------------------------------------------------
-TAGFILES               = 
-GENERATE_TAGFILE       = 
-ALLEXTERNALS           = NO
-EXTERNAL_GROUPS        = YES
-EXTERNAL_PAGES         = YES
-PERL_PATH              = /usr/bin/perl
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS         = NO
-MSCGEN_PATH            = 
-DIA_PATH               = 
-HIDE_UNDOC_RELATIONS   = YES
-HAVE_DOT               = NO
-DOT_NUM_THREADS        = 0
-DOT_FONTNAME           = Helvetica
-DOT_FONTSIZE           = 10
-DOT_FONTPATH           = 
-CLASS_GRAPH            = YES
-COLLABORATION_GRAPH    = YES
-GROUP_GRAPHS           = YES
-UML_LOOK               = NO
-UML_LIMIT_NUM_FIELDS   = 10
-TEMPLATE_RELATIONS     = NO
-INCLUDE_GRAPH          = YES
-INCLUDED_BY_GRAPH      = YES
-CALL_GRAPH             = NO
-CALLER_GRAPH           = NO
-GRAPHICAL_HIERARCHY    = YES
-DIRECTORY_GRAPH        = YES
-DOT_IMAGE_FORMAT       = png
-INTERACTIVE_SVG        = NO
-DOT_PATH               = 
-DOTFILE_DIRS           = 
-MSCFILE_DIRS           = 
-DIAFILE_DIRS           = 
-PLANTUML_JAR_PATH      = 
-DOT_GRAPH_MAX_NODES    = 50
-MAX_DOT_GRAPH_DEPTH    = 0
-DOT_TRANSPARENT        = NO
-DOT_MULTI_TARGETS      = NO
-GENERATE_LEGEND        = YES
-DOT_CLEANUP            = YES
diff --git a/Doxygen/at_logo.png b/Doxygen/at_logo.png
deleted file mode 100644
index c3ddc91a..00000000
Binary files a/Doxygen/at_logo.png and /dev/null differ
diff --git a/Doxygen/bootstrap.min.css b/Doxygen/bootstrap.min.css
deleted file mode 100755
index a9426366..00000000
--- a/Doxygen/bootstrap.min.css
+++ /dev/null
@@ -1,6730 +0,0 @@
-@import url("http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700");
-/*!
- * bootswatch v3.3.1+2
- * Homepage: http://bootswatch.com
- * Copyright 2012-2014 Thomas Park
- * Licensed under MIT
- * Based on Bootstrap
-*/
-/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
-
-html {
-    font-family: sans-serif;
-    -ms-text-size-adjust: 100%;
-    -webkit-text-size-adjust: 100%
-}
-body {
-    margin: 0
-}
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-main,
-menu,
-nav,
-section,
-summary {
-    display: block
-}
-audio,
-canvas,
-progress,
-video {
-    display: inline-block;
-    vertical-align: baseline
-}
-audio:not([controls]) {
-    display: none;
-    height: 0
-}
-[hidden],
-template {
-    display: none
-}
-a {
-    background-color: transparent
-}
-a:active,
-a:hover {
-    outline: 0
-}
-abbr[title] {
-    border-bottom: 1px dotted
-}
-b,
-strong {
-    font-weight: bold
-}
-dfn {
-    font-style: italic
-}
-h1 {
-    font-size: 2em;
-    margin: 0.67em 0
-}
-mark {
-    background: #ff0;
-    color: #000
-}
-small {
-    font-size: 80%
-}
-sub,
-sup {
-    font-size: 75%;
-    line-height: 0;
-    position: relative;
-    vertical-align: baseline
-}
-sup {
-    top: -0.5em
-}
-sub {
-    bottom: -0.25em
-}
-img {
-    border: 0
-}
-svg:not(:root) {
-    overflow: hidden
-}
-figure {
-    margin: 1em 40px
-}
-hr {
-    -moz-box-sizing: content-box;
-    -webkit-box-sizing: content-box;
-    box-sizing: content-box;
-    height: 0
-}
-pre {
-    overflow: auto
-}
-code,
-kbd,
-pre,
-samp {
-    font-family: monospace, monospace;
-    font-size: 1em
-}
-button,
-input,
-optgroup,
-select,
-textarea {
-    color: inherit;
-    font: inherit;
-    margin: 0
-}
-button {
-    overflow: visible
-}
-button,
-select {
-    text-transform: none
-}
-button,
-html input[type="button"],
-input[type="reset"],
-input[type="submit"] {
-    -webkit-appearance: button;
-    cursor: pointer
-}
-button[disabled],
-html input[disabled] {
-    cursor: default
-}
-button::-moz-focus-inner,
-input::-moz-focus-inner {
-    border: 0;
-    padding: 0
-}
-input {
-    line-height: normal
-}
-input[type="checkbox"],
-input[type="radio"] {
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-    padding: 0
-}
-input[type="number"]::-webkit-inner-spin-button,
-input[type="number"]::-webkit-outer-spin-button {
-    height: auto
-}
-input[type="search"] {
-    -webkit-appearance: textfield;
-    -moz-box-sizing: content-box;
-    -webkit-box-sizing: content-box;
-    box-sizing: content-box
-}
-input[type="search"]::-webkit-search-cancel-button,
-input[type="search"]::-webkit-search-decoration {
-    -webkit-appearance: none
-}
-fieldset {
-    border: 1px solid #c0c0c0;
-    margin: 0 2px;
-    padding: 0.35em 0.625em 0.75em
-}
-legend {
-    border: 0;
-    padding: 0
-}
-textarea {
-    overflow: auto
-}
-optgroup {
-    font-weight: bold
-}
-table {
-    border-collapse: collapse;
-    border-spacing: 0
-}
-td,
-th {
-    padding: 0
-}
-/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */
-
-@media print {
-    *,
-    *:before,
-    *:after {
-        background: transparent !important;
-        color: #000 !important;
-        -webkit-box-shadow: none !important;
-        box-shadow: none !important;
-        text-shadow: none !important
-    }
-    a,
-    a:visited {
-        text-decoration: underline
-    }
-    a[href]:after {
-        content: " (" attr(href) ")"
-    }
-    abbr[title]:after {
-        content: " (" attr(title) ")"
-    }
-    a[href^="#"]:after,
-    a[href^="javascript:"]:after {
-        content: ""
-    }
-    pre,
-    blockquote {
-        border: 1px solid #999;
-        page-break-inside: avoid
-    }
-    thead {
-        display: table-header-group
-    }
-    tr,
-    img {
-        page-break-inside: avoid
-    }
-    img {
-        max-width: 100% !important
-    }
-    p,
-    h2,
-    h3 {
-        orphans: 3;
-        widows: 3
-    }
-    h2,
-    h3 {
-        page-break-after: avoid
-    }
-    select {
-        background: #fff !important
-    }
-    .navbar {
-        display: none
-    }
-    .btn>.caret,
-    .dropup>.btn>.caret {
-        border-top-color: #000 !important
-    }
-    .label {
-        border: 1px solid #000
-    }
-    .table {
-        border-collapse: collapse !important
-    }
-    .table td,
-    .table th {
-        background-color: #fff !important
-    }
-    .table-bordered th,
-    .table-bordered td {
-        border: 1px solid #ddd !important
-    }
-}
-@font-face {
-    font-family: 'Glyphicons Halflings';
-    src: url('../fonts/glyphicons-halflings-regular.eot');
-    src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg')
-}
-.glyphicon {
-    position: relative;
-    top: 1px;
-    display: inline-block;
-    font-family: 'Glyphicons Halflings';
-    font-style: normal;
-    font-weight: normal;
-    line-height: 1;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale
-}
-.glyphicon-asterisk:before {
-    content: "\2a"
-}
-.glyphicon-plus:before {
-    content: "\2b"
-}
-.glyphicon-euro:before,
-.glyphicon-eur:before {
-    content: "\20ac"
-}
-.glyphicon-minus:before {
-    content: "\2212"
-}
-.glyphicon-cloud:before {
-    content: "\2601"
-}
-.glyphicon-envelope:before {
-    content: "\2709"
-}
-.glyphicon-pencil:before {
-    content: "\270f"
-}
-.glyphicon-glass:before {
-    content: "\e001"
-}
-.glyphicon-music:before {
-    content: "\e002"
-}
-.glyphicon-search:before {
-    content: "\e003"
-}
-.glyphicon-heart:before {
-    content: "\e005"
-}
-.glyphicon-star:before {
-    content: "\e006"
-}
-.glyphicon-star-empty:before {
-    content: "\e007"
-}
-.glyphicon-user:before {
-    content: "\e008"
-}
-.glyphicon-film:before {
-    content: "\e009"
-}
-.glyphicon-th-large:before {
-    content: "\e010"
-}
-.glyphicon-th:before {
-    content: "\e011"
-}
-.glyphicon-th-list:before {
-    content: "\e012"
-}
-.glyphicon-ok:before {
-    content: "\e013"
-}
-.glyphicon-remove:before {
-    content: "\e014"
-}
-.glyphicon-zoom-in:before {
-    content: "\e015"
-}
-.glyphicon-zoom-out:before {
-    content: "\e016"
-}
-.glyphicon-off:before {
-    content: "\e017"
-}
-.glyphicon-signal:before {
-    content: "\e018"
-}
-.glyphicon-cog:before {
-    content: "\e019"
-}
-.glyphicon-trash:before {
-    content: "\e020"
-}
-.glyphicon-home:before {
-    content: "\e021"
-}
-.glyphicon-file:before {
-    content: "\e022"
-}
-.glyphicon-time:before {
-    content: "\e023"
-}
-.glyphicon-road:before {
-    content: "\e024"
-}
-.glyphicon-download-alt:before {
-    content: "\e025"
-}
-.glyphicon-download:before {
-    content: "\e026"
-}
-.glyphicon-upload:before {
-    content: "\e027"
-}
-.glyphicon-inbox:before {
-    content: "\e028"
-}
-.glyphicon-play-circle:before {
-    content: "\e029"
-}
-.glyphicon-repeat:before {
-    content: "\e030"
-}
-.glyphicon-refresh:before {
-    content: "\e031"
-}
-.glyphicon-list-alt:before {
-    content: "\e032"
-}
-.glyphicon-lock:before {
-    content: "\e033"
-}
-.glyphicon-flag:before {
-    content: "\e034"
-}
-.glyphicon-headphones:before {
-    content: "\e035"
-}
-.glyphicon-volume-off:before {
-    content: "\e036"
-}
-.glyphicon-volume-down:before {
-    content: "\e037"
-}
-.glyphicon-volume-up:before {
-    content: "\e038"
-}
-.glyphicon-qrcode:before {
-    content: "\e039"
-}
-.glyphicon-barcode:before {
-    content: "\e040"
-}
-.glyphicon-tag:before {
-    content: "\e041"
-}
-.glyphicon-tags:before {
-    content: "\e042"
-}
-.glyphicon-book:before {
-    content: "\e043"
-}
-.glyphicon-bookmark:before {
-    content: "\e044"
-}
-.glyphicon-print:before {
-    content: "\e045"
-}
-.glyphicon-camera:before {
-    content: "\e046"
-}
-.glyphicon-font:before {
-    content: "\e047"
-}
-.glyphicon-bold:before {
-    content: "\e048"
-}
-.glyphicon-italic:before {
-    content: "\e049"
-}
-.glyphicon-text-height:before {
-    content: "\e050"
-}
-.glyphicon-text-width:before {
-    content: "\e051"
-}
-.glyphicon-align-left:before {
-    content: "\e052"
-}
-.glyphicon-align-center:before {
-    content: "\e053"
-}
-.glyphicon-align-right:before {
-    content: "\e054"
-}
-.glyphicon-align-justify:before {
-    content: "\e055"
-}
-.glyphicon-list:before {
-    content: "\e056"
-}
-.glyphicon-indent-left:before {
-    content: "\e057"
-}
-.glyphicon-indent-right:before {
-    content: "\e058"
-}
-.glyphicon-facetime-video:before {
-    content: "\e059"
-}
-.glyphicon-picture:before {
-    content: "\e060"
-}
-.glyphicon-map-marker:before {
-    content: "\e062"
-}
-.glyphicon-adjust:before {
-    content: "\e063"
-}
-.glyphicon-tint:before {
-    content: "\e064"
-}
-.glyphicon-edit:before {
-    content: "\e065"
-}
-.glyphicon-share:before {
-    content: "\e066"
-}
-.glyphicon-check:before {
-    content: "\e067"
-}
-.glyphicon-move:before {
-    content: "\e068"
-}
-.glyphicon-step-backward:before {
-    content: "\e069"
-}
-.glyphicon-fast-backward:before {
-    content: "\e070"
-}
-.glyphicon-backward:before {
-    content: "\e071"
-}
-.glyphicon-play:before {
-    content: "\e072"
-}
-.glyphicon-pause:before {
-    content: "\e073"
-}
-.glyphicon-stop:before {
-    content: "\e074"
-}
-.glyphicon-forward:before {
-    content: "\e075"
-}
-.glyphicon-fast-forward:before {
-    content: "\e076"
-}
-.glyphicon-step-forward:before {
-    content: "\e077"
-}
-.glyphicon-eject:before {
-    content: "\e078"
-}
-.glyphicon-chevron-left:before {
-    content: "\e079"
-}
-.glyphicon-chevron-right:before {
-    content: "\e080"
-}
-.glyphicon-plus-sign:before {
-    content: "\e081"
-}
-.glyphicon-minus-sign:before {
-    content: "\e082"
-}
-.glyphicon-remove-sign:before {
-    content: "\e083"
-}
-.glyphicon-ok-sign:before {
-    content: "\e084"
-}
-.glyphicon-question-sign:before {
-    content: "\e085"
-}
-.glyphicon-info-sign:before {
-    content: "\e086"
-}
-.glyphicon-screenshot:before {
-    content: "\e087"
-}
-.glyphicon-remove-circle:before {
-    content: "\e088"
-}
-.glyphicon-ok-circle:before {
-    content: "\e089"
-}
-.glyphicon-ban-circle:before {
-    content: "\e090"
-}
-.glyphicon-arrow-left:before {
-    content: "\e091"
-}
-.glyphicon-arrow-right:before {
-    content: "\e092"
-}
-.glyphicon-arrow-up:before {
-    content: "\e093"
-}
-.glyphicon-arrow-down:before {
-    content: "\e094"
-}
-.glyphicon-share-alt:before {
-    content: "\e095"
-}
-.glyphicon-resize-full:before {
-    content: "\e096"
-}
-.glyphicon-resize-small:before {
-    content: "\e097"
-}
-.glyphicon-exclamation-sign:before {
-    content: "\e101"
-}
-.glyphicon-gift:before {
-    content: "\e102"
-}
-.glyphicon-leaf:before {
-    content: "\e103"
-}
-.glyphicon-fire:before {
-    content: "\e104"
-}
-.glyphicon-eye-open:before {
-    content: "\e105"
-}
-.glyphicon-eye-close:before {
-    content: "\e106"
-}
-.glyphicon-warning-sign:before {
-    content: "\e107"
-}
-.glyphicon-plane:before {
-    content: "\e108"
-}
-.glyphicon-calendar:before {
-    content: "\e109"
-}
-.glyphicon-random:before {
-    content: "\e110"
-}
-.glyphicon-comment:before {
-    content: "\e111"
-}
-.glyphicon-magnet:before {
-    content: "\e112"
-}
-.glyphicon-chevron-up:before {
-    content: "\e113"
-}
-.glyphicon-chevron-down:before {
-    content: "\e114"
-}
-.glyphicon-retweet:before {
-    content: "\e115"
-}
-.glyphicon-shopping-cart:before {
-    content: "\e116"
-}
-.glyphicon-folder-close:before {
-    content: "\e117"
-}
-.glyphicon-folder-open:before {
-    content: "\e118"
-}
-.glyphicon-resize-vertical:before {
-    content: "\e119"
-}
-.glyphicon-resize-horizontal:before {
-    content: "\e120"
-}
-.glyphicon-hdd:before {
-    content: "\e121"
-}
-.glyphicon-bullhorn:before {
-    content: "\e122"
-}
-.glyphicon-bell:before {
-    content: "\e123"
-}
-.glyphicon-certificate:before {
-    content: "\e124"
-}
-.glyphicon-thumbs-up:before {
-    content: "\e125"
-}
-.glyphicon-thumbs-down:before {
-    content: "\e126"
-}
-.glyphicon-hand-right:before {
-    content: "\e127"
-}
-.glyphicon-hand-left:before {
-    content: "\e128"
-}
-.glyphicon-hand-up:before {
-    content: "\e129"
-}
-.glyphicon-hand-down:before {
-    content: "\e130"
-}
-.glyphicon-circle-arrow-right:before {
-    content: "\e131"
-}
-.glyphicon-circle-arrow-left:before {
-    content: "\e132"
-}
-.glyphicon-circle-arrow-up:before {
-    content: "\e133"
-}
-.glyphicon-circle-arrow-down:before {
-    content: "\e134"
-}
-.glyphicon-globe:before {
-    content: "\e135"
-}
-.glyphicon-wrench:before {
-    content: "\e136"
-}
-.glyphicon-tasks:before {
-    content: "\e137"
-}
-.glyphicon-filter:before {
-    content: "\e138"
-}
-.glyphicon-briefcase:before {
-    content: "\e139"
-}
-.glyphicon-fullscreen:before {
-    content: "\e140"
-}
-.glyphicon-dashboard:before {
-    content: "\e141"
-}
-.glyphicon-paperclip:before {
-    content: "\e142"
-}
-.glyphicon-heart-empty:before {
-    content: "\e143"
-}
-.glyphicon-link:before {
-    content: "\e144"
-}
-.glyphicon-phone:before {
-    content: "\e145"
-}
-.glyphicon-pushpin:before {
-    content: "\e146"
-}
-.glyphicon-usd:before {
-    content: "\e148"
-}
-.glyphicon-gbp:before {
-    content: "\e149"
-}
-.glyphicon-sort:before {
-    content: "\e150"
-}
-.glyphicon-sort-by-alphabet:before {
-    content: "\e151"
-}
-.glyphicon-sort-by-alphabet-alt:before {
-    content: "\e152"
-}
-.glyphicon-sort-by-order:before {
-    content: "\e153"
-}
-.glyphicon-sort-by-order-alt:before {
-    content: "\e154"
-}
-.glyphicon-sort-by-attributes:before {
-    content: "\e155"
-}
-.glyphicon-sort-by-attributes-alt:before {
-    content: "\e156"
-}
-.glyphicon-unchecked:before {
-    content: "\e157"
-}
-.glyphicon-expand:before {
-    content: "\e158"
-}
-.glyphicon-collapse-down:before {
-    content: "\e159"
-}
-.glyphicon-collapse-up:before {
-    content: "\e160"
-}
-.glyphicon-log-in:before {
-    content: "\e161"
-}
-.glyphicon-flash:before {
-    content: "\e162"
-}
-.glyphicon-log-out:before {
-    content: "\e163"
-}
-.glyphicon-new-window:before {
-    content: "\e164"
-}
-.glyphicon-record:before {
-    content: "\e165"
-}
-.glyphicon-save:before {
-    content: "\e166"
-}
-.glyphicon-open:before {
-    content: "\e167"
-}
-.glyphicon-saved:before {
-    content: "\e168"
-}
-.glyphicon-import:before {
-    content: "\e169"
-}
-.glyphicon-export:before {
-    content: "\e170"
-}
-.glyphicon-send:before {
-    content: "\e171"
-}
-.glyphicon-floppy-disk:before {
-    content: "\e172"
-}
-.glyphicon-floppy-saved:before {
-    content: "\e173"
-}
-.glyphicon-floppy-remove:before {
-    content: "\e174"
-}
-.glyphicon-floppy-save:before {
-    content: "\e175"
-}
-.glyphicon-floppy-open:before {
-    content: "\e176"
-}
-.glyphicon-credit-card:before {
-    content: "\e177"
-}
-.glyphicon-transfer:before {
-    content: "\e178"
-}
-.glyphicon-cutlery:before {
-    content: "\e179"
-}
-.glyphicon-header:before {
-    content: "\e180"
-}
-.glyphicon-compressed:before {
-    content: "\e181"
-}
-.glyphicon-earphone:before {
-    content: "\e182"
-}
-.glyphicon-phone-alt:before {
-    content: "\e183"
-}
-.glyphicon-tower:before {
-    content: "\e184"
-}
-.glyphicon-stats:before {
-    content: "\e185"
-}
-.glyphicon-sd-video:before {
-    content: "\e186"
-}
-.glyphicon-hd-video:before {
-    content: "\e187"
-}
-.glyphicon-subtitles:before {
-    content: "\e188"
-}
-.glyphicon-sound-stereo:before {
-    content: "\e189"
-}
-.glyphicon-sound-dolby:before {
-    content: "\e190"
-}
-.glyphicon-sound-5-1:before {
-    content: "\e191"
-}
-.glyphicon-sound-6-1:before {
-    content: "\e192"
-}
-.glyphicon-sound-7-1:before {
-    content: "\e193"
-}
-.glyphicon-copyright-mark:before {
-    content: "\e194"
-}
-.glyphicon-registration-mark:before {
-    content: "\e195"
-}
-.glyphicon-cloud-download:before {
-    content: "\e197"
-}
-.glyphicon-cloud-upload:before {
-    content: "\e198"
-}
-.glyphicon-tree-conifer:before {
-    content: "\e199"
-}
-.glyphicon-tree-deciduous:before {
-    content: "\e200"
-}
-* {
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box
-}
-*:before,
-*:after {
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box
-}
-html {
-    font-size: 10px;
-    -webkit-tap-highlight-color: rgba(0, 0, 0, 0)
-}
-body {
-    font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
-    font-size: 15px;
-    line-height: 1.4;
-    color: #222222;
-    background-color: #ffffff
-}
-input,
-button,
-select,
-textarea {
-    font-family: inherit;
-    font-size: inherit;
-    line-height: inherit
-}
-a {
-    color: #008cba;
-    text-decoration: none
-}
-a:hover,
-a:focus {
-    color: #00526e;
-    text-decoration: underline
-}
-a:focus {
-    outline: thin dotted;
-    outline: 5px auto -webkit-focus-ring-color;
-    outline-offset: -2px
-}
-figure {
-    margin: 0
-}
-img {
-    vertical-align: middle
-}
-.img-responsive,
-.thumbnail>img,
-.thumbnail a>img,
-.carousel-inner>.item>img,
-.carousel-inner>.item>a>img {
-    display: block;
-    max-width: 100%;
-    height: auto
-}
-.img-rounded {
-    border-radius: 0
-}
-.img-thumbnail {
-    padding: 4px;
-    line-height: 1.4;
-    background-color: #ffffff;
-    border: 1px solid #dddddd;
-    border-radius: 0;
-    -webkit-transition: all .2s ease-in-out;
-    -o-transition: all .2s ease-in-out;
-    transition: all .2s ease-in-out;
-    display: inline-block;
-    max-width: 100%;
-    height: auto
-}
-.img-circle {
-    border-radius: 50%
-}
-hr {
-    margin-top: 21px;
-    margin-bottom: 21px;
-    border: 0;
-    border-top: 1px solid #dddddd
-}
-.sr-only {
-    position: absolute;
-    width: 1px;
-    height: 1px;
-    margin: -1px;
-    padding: 0;
-    overflow: hidden;
-    clip: rect(0, 0, 0, 0);
-    border: 0
-}
-.sr-only-focusable:active,
-.sr-only-focusable:focus {
-    position: static;
-    width: auto;
-    height: auto;
-    margin: 0;
-    overflow: visible;
-    clip: auto
-}
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-.h1,
-.h2,
-.h3,
-.h4,
-.h5,
-.h6 {
-    font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
-    font-weight: 300;
-    line-height: 1.1;
-    color: inherit
-}
-h1 small,
-h2 small,
-h3 small,
-h4 small,
-h5 small,
-h6 small,
-.h1 small,
-.h2 small,
-.h3 small,
-.h4 small,
-.h5 small,
-.h6 small,
-h1 .small,
-h2 .small,
-h3 .small,
-h4 .small,
-h5 .small,
-h6 .small,
-.h1 .small,
-.h2 .small,
-.h3 .small,
-.h4 .small,
-.h5 .small,
-.h6 .small {
-    font-weight: normal;
-    line-height: 1;
-    color: #999999
-}
-h1,
-.h1,
-h2,
-.h2,
-h3,
-.h3 {
-    margin-top: 21px;
-    margin-bottom: 10.5px
-}
-h1 small,
-.h1 small,
-h2 small,
-.h2 small,
-h3 small,
-.h3 small,
-h1 .small,
-.h1 .small,
-h2 .small,
-.h2 .small,
-h3 .small,
-.h3 .small {
-    font-size: 65%
-}
-h4,
-.h4,
-h5,
-.h5,
-h6,
-.h6 {
-    margin-top: 10.5px;
-    margin-bottom: 10.5px
-}
-h4 small,
-.h4 small,
-h5 small,
-.h5 small,
-h6 small,
-.h6 small,
-h4 .small,
-.h4 .small,
-h5 .small,
-.h5 .small,
-h6 .small,
-.h6 .small {
-    font-size: 75%
-}
-h1,
-.h1 {
-    font-size: 39px
-}
-h2,
-.h2 {
-    font-size: 32px
-}
-h3,
-.h3 {
-    font-size: 26px
-}
-h4,
-.h4 {
-    font-size: 19px
-}
-h5,
-.h5 {
-    font-size: 15px
-}
-h6,
-.h6 {
-    font-size: 13px
-}
-p {
-    margin: 0 0 10.5px
-}
-.lead {
-    margin-bottom: 21px;
-    font-size: 17px;
-    font-weight: 300;
-    line-height: 1.4
-}
-@media (min-width: 768px) {
-    .lead {
-        font-size: 22.5px
-    }
-}
-small,
-.small {
-    font-size: 80%
-}
-mark,
-.mark {
-    background-color: #fcf8e3;
-    padding: .2em
-}
-.text-left {
-    text-align: left
-}
-.text-right {
-    text-align: right
-}
-.text-center {
-    text-align: center
-}
-.text-justify {
-    text-align: justify
-}
-.text-nowrap {
-    white-space: nowrap
-}
-.text-lowercase {
-    text-transform: lowercase
-}
-.text-uppercase {
-    text-transform: uppercase
-}
-.text-capitalize {
-    text-transform: capitalize
-}
-.text-muted {
-    color: #999999
-}
-.text-primary {
-    color: #008cba
-}
-a.text-primary:hover {
-    color: #006687
-}
-.text-success {
-    color: #43ac6a
-}
-a.text-success:hover {
-    color: #358753
-}
-.text-info {
-    color: #5bc0de
-}
-a.text-info:hover {
-    color: #31b0d5
-}
-.text-warning {
-    color: #e99002
-}
-a.text-warning:hover {
-    color: #b67102
-}
-.text-danger {
-    color: #f04124
-}
-a.text-danger:hover {
-    color: #d32a0e
-}
-.bg-primary {
-    color: #fff;
-    background-color: #008cba
-}
-a.bg-primary:hover {
-    background-color: #006687
-}
-.bg-success {
-    background-color: #dff0d8
-}
-a.bg-success:hover {
-    background-color: #c1e2b3
-}
-.bg-info {
-    background-color: #d9edf7
-}
-a.bg-info:hover {
-    background-color: #afd9ee
-}
-.bg-warning {
-    background-color: #fcf8e3
-}
-a.bg-warning:hover {
-    background-color: #f7ecb5
-}
-.bg-danger {
-    background-color: #f2dede
-}
-a.bg-danger:hover {
-    background-color: #e4b9b9
-}
-.page-header {
-    padding-bottom: 9.5px;
-    margin: 42px 0 21px;
-    border-bottom: 1px solid #dddddd
-}
-ul,
-ol {
-    margin-top: 0;
-    margin-bottom: 10.5px
-}
-ul ul,
-ol ul,
-ul ol,
-ol ol {
-    margin-bottom: 0
-}
-.list-unstyled {
-    padding-left: 0;
-    list-style: none
-}
-.list-inline {
-    padding-left: 0;
-    list-style: none;
-    margin-left: -5px
-}
-.list-inline>li {
-    display: inline-block;
-    padding-left: 5px;
-    padding-right: 5px
-}
-dl {
-    margin-top: 0;
-    margin-bottom: 21px
-}
-dt,
-dd {
-    line-height: 1.4
-}
-dt {
-    font-weight: bold
-}
-dd {
-    margin-left: 0
-}
-@media (min-width: 768px) {
-    .dl-horizontal dt {
-        float: left;
-        width: 160px;
-        clear: left;
-        text-align: right;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap
-    }
-    .dl-horizontal dd {
-        margin-left: 180px
-    }
-}
-abbr[title],
-abbr[data-original-title] {
-    cursor: help;
-    border-bottom: 1px dotted #999999
-}
-.initialism {
-    font-size: 90%;
-    text-transform: uppercase
-}
-blockquote {
-    padding: 10.5px 21px;
-    margin: 0 0 21px;
-    font-size: 18.75px;
-    border-left: 5px solid #dddddd
-}
-blockquote p:last-child,
-blockquote ul:last-child,
-blockquote ol:last-child {
-    margin-bottom: 0
-}
-blockquote footer,
-blockquote small,
-blockquote .small {
-    display: block;
-    font-size: 80%;
-    line-height: 1.4;
-    color: #6f6f6f
-}
-blockquote footer:before,
-blockquote small:before,
-blockquote .small:before {
-    content: '\2014 \00A0'
-}
-.blockquote-reverse,
-blockquote.pull-right {
-    padding-right: 15px;
-    padding-left: 0;
-    border-right: 5px solid #dddddd;
-    border-left: 0;
-    text-align: right
-}
-.blockquote-reverse footer:before,
-blockquote.pull-right footer:before,
-.blockquote-reverse small:before,
-blockquote.pull-right small:before,
-.blockquote-reverse .small:before,
-blockquote.pull-right .small:before {
-    content: ''
-}
-.blockquote-reverse footer:after,
-blockquote.pull-right footer:after,
-.blockquote-reverse small:after,
-blockquote.pull-right small:after,
-.blockquote-reverse .small:after,
-blockquote.pull-right .small:after {
-    content: '\00A0 \2014'
-}
-address {
-    margin-bottom: 21px;
-    font-style: normal;
-    line-height: 1.4
-}
-code,
-kbd,
-pre,
-samp {
-    font-family: Menlo, Monaco, Consolas, "Courier New", monospace
-}
-code {
-    padding: 2px 4px;
-    font-size: 90%;
-    color: #c7254e;
-    background-color: #f9f2f4;
-    border-radius: 0
-}
-kbd {
-    padding: 2px 4px;
-    font-size: 90%;
-    color: #ffffff;
-    background-color: #333333;
-    border-radius: 0;
-    -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25);
-    box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25)
-}
-kbd kbd {
-    padding: 0;
-    font-size: 100%;
-    font-weight: bold;
-    -webkit-box-shadow: none;
-    box-shadow: none
-}
-pre {
-    display: block;
-    padding: 10px;
-    margin: 0 0 10.5px;
-    font-size: 14px;
-    line-height: 1.4;
-    word-break: break-all;
-    word-wrap: break-word;
-    color: #333333;
-    background-color: #f5f5f5;
-    border: 1px solid #cccccc;
-    border-radius: 0
-}
-pre code {
-    padding: 0;
-    font-size: inherit;
-    color: inherit;
-    white-space: pre-wrap;
-    background-color: transparent;
-    border-radius: 0
-}
-.pre-scrollable {
-    max-height: 340px;
-    overflow-y: scroll
-}
-.container {
-    margin-right: auto;
-    margin-left: auto;
-    padding-left: 15px;
-    padding-right: 15px
-}
-@media (min-width: 768px) {
-    .container {
-        width: 750px
-    }
-}
-@media (min-width: 992px) {
-    .container {
-        width: 970px
-    }
-}
-@media (min-width: 1200px) {
-    .container {
-        width: 1170px
-    }
-}
-.container-fluid {
-    margin-right: auto;
-    margin-left: auto;
-    padding-left: 15px;
-    padding-right: 15px
-}
-.row {
-    margin-left: -15px;
-    margin-right: -15px
-}
-.col-xs-1,
-.col-sm-1,
-.col-md-1,
-.col-lg-1,
-.col-xs-2,
-.col-sm-2,
-.col-md-2,
-.col-lg-2,
-.col-xs-3,
-.col-sm-3,
-.col-md-3,
-.col-lg-3,
-.col-xs-4,
-.col-sm-4,
-.col-md-4,
-.col-lg-4,
-.col-xs-5,
-.col-sm-5,
-.col-md-5,
-.col-lg-5,
-.col-xs-6,
-.col-sm-6,
-.col-md-6,
-.col-lg-6,
-.col-xs-7,
-.col-sm-7,
-.col-md-7,
-.col-lg-7,
-.col-xs-8,
-.col-sm-8,
-.col-md-8,
-.col-lg-8,
-.col-xs-9,
-.col-sm-9,
-.col-md-9,
-.col-lg-9,
-.col-xs-10,
-.col-sm-10,
-.col-md-10,
-.col-lg-10,
-.col-xs-11,
-.col-sm-11,
-.col-md-11,
-.col-lg-11,
-.col-xs-12,
-.col-sm-12,
-.col-md-12,
-.col-lg-12 {
-    position: relative;
-    min-height: 1px;
-    padding-left: 15px;
-    padding-right: 15px
-}
-.col-xs-1,
-.col-xs-2,
-.col-xs-3,
-.col-xs-4,
-.col-xs-5,
-.col-xs-6,
-.col-xs-7,
-.col-xs-8,
-.col-xs-9,
-.col-xs-10,
-.col-xs-11,
-.col-xs-12 {
-    float: left
-}
-.col-xs-12 {
-    width: 100%
-}
-.col-xs-11 {
-    width: 91.66666667%
-}
-.col-xs-10 {
-    width: 83.33333333%
-}
-.col-xs-9 {
-    width: 75%
-}
-.col-xs-8 {
-    width: 66.66666667%
-}
-.col-xs-7 {
-    width: 58.33333333%
-}
-.col-xs-6 {
-    width: 50%
-}
-.col-xs-5 {
-    width: 41.66666667%
-}
-.col-xs-4 {
-    width: 33.33333333%
-}
-.col-xs-3 {
-    width: 25%
-}
-.col-xs-2 {
-    width: 16.66666667%
-}
-.col-xs-1 {
-    width: 8.33333333%
-}
-.col-xs-pull-12 {
-    right: 100%
-}
-.col-xs-pull-11 {
-    right: 91.66666667%
-}
-.col-xs-pull-10 {
-    right: 83.33333333%
-}
-.col-xs-pull-9 {
-    right: 75%
-}
-.col-xs-pull-8 {
-    right: 66.66666667%
-}
-.col-xs-pull-7 {
-    right: 58.33333333%
-}
-.col-xs-pull-6 {
-    right: 50%
-}
-.col-xs-pull-5 {
-    right: 41.66666667%
-}
-.col-xs-pull-4 {
-    right: 33.33333333%
-}
-.col-xs-pull-3 {
-    right: 25%
-}
-.col-xs-pull-2 {
-    right: 16.66666667%
-}
-.col-xs-pull-1 {
-    right: 8.33333333%
-}
-.col-xs-pull-0 {
-    right: auto
-}
-.col-xs-push-12 {
-    left: 100%
-}
-.col-xs-push-11 {
-    left: 91.66666667%
-}
-.col-xs-push-10 {
-    left: 83.33333333%
-}
-.col-xs-push-9 {
-    left: 75%
-}
-.col-xs-push-8 {
-    left: 66.66666667%
-}
-.col-xs-push-7 {
-    left: 58.33333333%
-}
-.col-xs-push-6 {
-    left: 50%
-}
-.col-xs-push-5 {
-    left: 41.66666667%
-}
-.col-xs-push-4 {
-    left: 33.33333333%
-}
-.col-xs-push-3 {
-    left: 25%
-}
-.col-xs-push-2 {
-    left: 16.66666667%
-}
-.col-xs-push-1 {
-    left: 8.33333333%
-}
-.col-xs-push-0 {
-    left: auto
-}
-.col-xs-offset-12 {
-    margin-left: 100%
-}
-.col-xs-offset-11 {
-    margin-left: 91.66666667%
-}
-.col-xs-offset-10 {
-    margin-left: 83.33333333%
-}
-.col-xs-offset-9 {
-    margin-left: 75%
-}
-.col-xs-offset-8 {
-    margin-left: 66.66666667%
-}
-.col-xs-offset-7 {
-    margin-left: 58.33333333%
-}
-.col-xs-offset-6 {
-    margin-left: 50%
-}
-.col-xs-offset-5 {
-    margin-left: 41.66666667%
-}
-.col-xs-offset-4 {
-    margin-left: 33.33333333%
-}
-.col-xs-offset-3 {
-    margin-left: 25%
-}
-.col-xs-offset-2 {
-    margin-left: 16.66666667%
-}
-.col-xs-offset-1 {
-    margin-left: 8.33333333%
-}
-.col-xs-offset-0 {
-    margin-left: 0%
-}
-@media (min-width: 768px) {
-    .col-sm-1,
-    .col-sm-2,
-    .col-sm-3,
-    .col-sm-4,
-    .col-sm-5,
-    .col-sm-6,
-    .col-sm-7,
-    .col-sm-8,
-    .col-sm-9,
-    .col-sm-10,
-    .col-sm-11,
-    .col-sm-12 {
-        float: left
-    }
-    .col-sm-12 {
-        width: 100%
-    }
-    .col-sm-11 {
-        width: 91.66666667%
-    }
-    .col-sm-10 {
-        width: 83.33333333%
-    }
-    .col-sm-9 {
-        width: 75%
-    }
-    .col-sm-8 {
-        width: 66.66666667%
-    }
-    .col-sm-7 {
-        width: 58.33333333%
-    }
-    .col-sm-6 {
-        width: 50%
-    }
-    .col-sm-5 {
-        width: 41.66666667%
-    }
-    .col-sm-4 {
-        width: 33.33333333%
-    }
-    .col-sm-3 {
-        width: 25%
-    }
-    .col-sm-2 {
-        width: 16.66666667%
-    }
-    .col-sm-1 {
-        width: 8.33333333%
-    }
-    .col-sm-pull-12 {
-        right: 100%
-    }
-    .col-sm-pull-11 {
-        right: 91.66666667%
-    }
-    .col-sm-pull-10 {
-        right: 83.33333333%
-    }
-    .col-sm-pull-9 {
-        right: 75%
-    }
-    .col-sm-pull-8 {
-        right: 66.66666667%
-    }
-    .col-sm-pull-7 {
-        right: 58.33333333%
-    }
-    .col-sm-pull-6 {
-        right: 50%
-    }
-    .col-sm-pull-5 {
-        right: 41.66666667%
-    }
-    .col-sm-pull-4 {
-        right: 33.33333333%
-    }
-    .col-sm-pull-3 {
-        right: 25%
-    }
-    .col-sm-pull-2 {
-        right: 16.66666667%
-    }
-    .col-sm-pull-1 {
-        right: 8.33333333%
-    }
-    .col-sm-pull-0 {
-        right: auto
-    }
-    .col-sm-push-12 {
-        left: 100%
-    }
-    .col-sm-push-11 {
-        left: 91.66666667%
-    }
-    .col-sm-push-10 {
-        left: 83.33333333%
-    }
-    .col-sm-push-9 {
-        left: 75%
-    }
-    .col-sm-push-8 {
-        left: 66.66666667%
-    }
-    .col-sm-push-7 {
-        left: 58.33333333%
-    }
-    .col-sm-push-6 {
-        left: 50%
-    }
-    .col-sm-push-5 {
-        left: 41.66666667%
-    }
-    .col-sm-push-4 {
-        left: 33.33333333%
-    }
-    .col-sm-push-3 {
-        left: 25%
-    }
-    .col-sm-push-2 {
-        left: 16.66666667%
-    }
-    .col-sm-push-1 {
-        left: 8.33333333%
-    }
-    .col-sm-push-0 {
-        left: auto
-    }
-    .col-sm-offset-12 {
-        margin-left: 100%
-    }
-    .col-sm-offset-11 {
-        margin-left: 91.66666667%
-    }
-    .col-sm-offset-10 {
-        margin-left: 83.33333333%
-    }
-    .col-sm-offset-9 {
-        margin-left: 75%
-    }
-    .col-sm-offset-8 {
-        margin-left: 66.66666667%
-    }
-    .col-sm-offset-7 {
-        margin-left: 58.33333333%
-    }
-    .col-sm-offset-6 {
-        margin-left: 50%
-    }
-    .col-sm-offset-5 {
-        margin-left: 41.66666667%
-    }
-    .col-sm-offset-4 {
-        margin-left: 33.33333333%
-    }
-    .col-sm-offset-3 {
-        margin-left: 25%
-    }
-    .col-sm-offset-2 {
-        margin-left: 16.66666667%
-    }
-    .col-sm-offset-1 {
-        margin-left: 8.33333333%
-    }
-    .col-sm-offset-0 {
-        margin-left: 0%
-    }
-}
-@media (min-width: 992px) {
-    .col-md-1,
-    .col-md-2,
-    .col-md-3,
-    .col-md-4,
-    .col-md-5,
-    .col-md-6,
-    .col-md-7,
-    .col-md-8,
-    .col-md-9,
-    .col-md-10,
-    .col-md-11,
-    .col-md-12 {
-        float: left
-    }
-    .col-md-12 {
-        width: 100%
-    }
-    .col-md-11 {
-        width: 91.66666667%
-    }
-    .col-md-10 {
-        width: 83.33333333%
-    }
-    .col-md-9 {
-        width: 75%
-    }
-    .col-md-8 {
-        width: 66.66666667%
-    }
-    .col-md-7 {
-        width: 58.33333333%
-    }
-    .col-md-6 {
-        width: 50%
-    }
-    .col-md-5 {
-        width: 41.66666667%
-    }
-    .col-md-4 {
-        width: 33.33333333%
-    }
-    .col-md-3 {
-        width: 25%
-    }
-    .col-md-2 {
-        width: 16.66666667%
-    }
-    .col-md-1 {
-        width: 8.33333333%
-    }
-    .col-md-pull-12 {
-        right: 100%
-    }
-    .col-md-pull-11 {
-        right: 91.66666667%
-    }
-    .col-md-pull-10 {
-        right: 83.33333333%
-    }
-    .col-md-pull-9 {
-        right: 75%
-    }
-    .col-md-pull-8 {
-        right: 66.66666667%
-    }
-    .col-md-pull-7 {
-        right: 58.33333333%
-    }
-    .col-md-pull-6 {
-        right: 50%
-    }
-    .col-md-pull-5 {
-        right: 41.66666667%
-    }
-    .col-md-pull-4 {
-        right: 33.33333333%
-    }
-    .col-md-pull-3 {
-        right: 25%
-    }
-    .col-md-pull-2 {
-        right: 16.66666667%
-    }
-    .col-md-pull-1 {
-        right: 8.33333333%
-    }
-    .col-md-pull-0 {
-        right: auto
-    }
-    .col-md-push-12 {
-        left: 100%
-    }
-    .col-md-push-11 {
-        left: 91.66666667%
-    }
-    .col-md-push-10 {
-        left: 83.33333333%
-    }
-    .col-md-push-9 {
-        left: 75%
-    }
-    .col-md-push-8 {
-        left: 66.66666667%
-    }
-    .col-md-push-7 {
-        left: 58.33333333%
-    }
-    .col-md-push-6 {
-        left: 50%
-    }
-    .col-md-push-5 {
-        left: 41.66666667%
-    }
-    .col-md-push-4 {
-        left: 33.33333333%
-    }
-    .col-md-push-3 {
-        left: 25%
-    }
-    .col-md-push-2 {
-        left: 16.66666667%
-    }
-    .col-md-push-1 {
-        left: 8.33333333%
-    }
-    .col-md-push-0 {
-        left: auto
-    }
-    .col-md-offset-12 {
-        margin-left: 100%
-    }
-    .col-md-offset-11 {
-        margin-left: 91.66666667%
-    }
-    .col-md-offset-10 {
-        margin-left: 83.33333333%
-    }
-    .col-md-offset-9 {
-        margin-left: 75%
-    }
-    .col-md-offset-8 {
-        margin-left: 66.66666667%
-    }
-    .col-md-offset-7 {
-        margin-left: 58.33333333%
-    }
-    .col-md-offset-6 {
-        margin-left: 50%
-    }
-    .col-md-offset-5 {
-        margin-left: 41.66666667%
-    }
-    .col-md-offset-4 {
-        margin-left: 33.33333333%
-    }
-    .col-md-offset-3 {
-        margin-left: 25%
-    }
-    .col-md-offset-2 {
-        margin-left: 16.66666667%
-    }
-    .col-md-offset-1 {
-        margin-left: 8.33333333%
-    }
-    .col-md-offset-0 {
-        margin-left: 0%
-    }
-}
-@media (min-width: 1200px) {
-    .col-lg-1,
-    .col-lg-2,
-    .col-lg-3,
-    .col-lg-4,
-    .col-lg-5,
-    .col-lg-6,
-    .col-lg-7,
-    .col-lg-8,
-    .col-lg-9,
-    .col-lg-10,
-    .col-lg-11,
-    .col-lg-12 {
-        float: left
-    }
-    .col-lg-12 {
-        width: 100%
-    }
-    .col-lg-11 {
-        width: 91.66666667%
-    }
-    .col-lg-10 {
-        width: 83.33333333%
-    }
-    .col-lg-9 {
-        width: 75%
-    }
-    .col-lg-8 {
-        width: 66.66666667%
-    }
-    .col-lg-7 {
-        width: 58.33333333%
-    }
-    .col-lg-6 {
-        width: 50%
-    }
-    .col-lg-5 {
-        width: 41.66666667%
-    }
-    .col-lg-4 {
-        width: 33.33333333%
-    }
-    .col-lg-3 {
-        width: 25%
-    }
-    .col-lg-2 {
-        width: 16.66666667%
-    }
-    .col-lg-1 {
-        width: 8.33333333%
-    }
-    .col-lg-pull-12 {
-        right: 100%
-    }
-    .col-lg-pull-11 {
-        right: 91.66666667%
-    }
-    .col-lg-pull-10 {
-        right: 83.33333333%
-    }
-    .col-lg-pull-9 {
-        right: 75%
-    }
-    .col-lg-pull-8 {
-        right: 66.66666667%
-    }
-    .col-lg-pull-7 {
-        right: 58.33333333%
-    }
-    .col-lg-pull-6 {
-        right: 50%
-    }
-    .col-lg-pull-5 {
-        right: 41.66666667%
-    }
-    .col-lg-pull-4 {
-        right: 33.33333333%
-    }
-    .col-lg-pull-3 {
-        right: 25%
-    }
-    .col-lg-pull-2 {
-        right: 16.66666667%
-    }
-    .col-lg-pull-1 {
-        right: 8.33333333%
-    }
-    .col-lg-pull-0 {
-        right: auto
-    }
-    .col-lg-push-12 {
-        left: 100%
-    }
-    .col-lg-push-11 {
-        left: 91.66666667%
-    }
-    .col-lg-push-10 {
-        left: 83.33333333%
-    }
-    .col-lg-push-9 {
-        left: 75%
-    }
-    .col-lg-push-8 {
-        left: 66.66666667%
-    }
-    .col-lg-push-7 {
-        left: 58.33333333%
-    }
-    .col-lg-push-6 {
-        left: 50%
-    }
-    .col-lg-push-5 {
-        left: 41.66666667%
-    }
-    .col-lg-push-4 {
-        left: 33.33333333%
-    }
-    .col-lg-push-3 {
-        left: 25%
-    }
-    .col-lg-push-2 {
-        left: 16.66666667%
-    }
-    .col-lg-push-1 {
-        left: 8.33333333%
-    }
-    .col-lg-push-0 {
-        left: auto
-    }
-    .col-lg-offset-12 {
-        margin-left: 100%
-    }
-    .col-lg-offset-11 {
-        margin-left: 91.66666667%
-    }
-    .col-lg-offset-10 {
-        margin-left: 83.33333333%
-    }
-    .col-lg-offset-9 {
-        margin-left: 75%
-    }
-    .col-lg-offset-8 {
-        margin-left: 66.66666667%
-    }
-    .col-lg-offset-7 {
-        margin-left: 58.33333333%
-    }
-    .col-lg-offset-6 {
-        margin-left: 50%
-    }
-    .col-lg-offset-5 {
-        margin-left: 41.66666667%
-    }
-    .col-lg-offset-4 {
-        margin-left: 33.33333333%
-    }
-    .col-lg-offset-3 {
-        margin-left: 25%
-    }
-    .col-lg-offset-2 {
-        margin-left: 16.66666667%
-    }
-    .col-lg-offset-1 {
-        margin-left: 8.33333333%
-    }
-    .col-lg-offset-0 {
-        margin-left: 0%
-    }
-}
-table {
-    background-color: transparent
-}
-caption {
-    padding-top: 8px;
-    padding-bottom: 8px;
-    color: #999999;
-    text-align: left
-}
-th {
-    text-align: left
-}
-.table {
-    width: 100%;
-    max-width: 100%;
-    margin-bottom: 21px
-}
-.table>thead>tr>th,
-.table>tbody>tr>th,
-.table>tfoot>tr>th,
-.table>thead>tr>td,
-.table>tbody>tr>td,
-.table>tfoot>tr>td {
-    padding: 8px;
-    line-height: 1.4;
-    vertical-align: top;
-    border-top: 1px solid #dddddd
-}
-.table>thead>tr>th {
-    vertical-align: bottom;
-    border-bottom: 2px solid #dddddd
-}
-.table>caption+thead>tr:first-child>th,
-.table>colgroup+thead>tr:first-child>th,
-.table>thead:first-child>tr:first-child>th,
-.table>caption+thead>tr:first-child>td,
-.table>colgroup+thead>tr:first-child>td,
-.table>thead:first-child>tr:first-child>td {
-    border-top: 0
-}
-.table>tbody+tbody {
-    border-top: 2px solid #dddddd
-}
-.table .table {
-    background-color: #ffffff
-}
-.table-condensed>thead>tr>th,
-.table-condensed>tbody>tr>th,
-.table-condensed>tfoot>tr>th,
-.table-condensed>thead>tr>td,
-.table-condensed>tbody>tr>td,
-.table-condensed>tfoot>tr>td {
-    padding: 5px
-}
-.table-bordered {
-    border: 1px solid #dddddd
-}
-.table-bordered>thead>tr>th,
-.table-bordered>tbody>tr>th,
-.table-bordered>tfoot>tr>th,
-.table-bordered>thead>tr>td,
-.table-bordered>tbody>tr>td,
-.table-bordered>tfoot>tr>td {
-    border: 1px solid #dddddd
-}
-.table-bordered>thead>tr>th,
-.table-bordered>thead>tr>td {
-    border-bottom-width: 2px
-}
-.table-striped>tbody>tr:nth-child(odd) {
-    background-color: #f9f9f9
-}
-.table-hover>tbody>tr:hover {
-    background-color: #f5f5f5
-}
-table col[class*="col-"] {
-    position: static;
-    float: none;
-    display: table-column
-}
-table td[class*="col-"],
-table th[class*="col-"] {
-    position: static;
-    float: none;
-    display: table-cell
-}
-.table>thead>tr>td.active,
-.table>tbody>tr>td.active,
-.table>tfoot>tr>td.active,
-.table>thead>tr>th.active,
-.table>tbody>tr>th.active,
-.table>tfoot>tr>th.active,
-.table>thead>tr.active>td,
-.table>tbody>tr.active>td,
-.table>tfoot>tr.active>td,
-.table>thead>tr.active>th,
-.table>tbody>tr.active>th,
-.table>tfoot>tr.active>th {
-    background-color: #f5f5f5
-}
-.table-hover>tbody>tr>td.active:hover,
-.table-hover>tbody>tr>th.active:hover,
-.table-hover>tbody>tr.active:hover>td,
-.table-hover>tbody>tr:hover>.active,
-.table-hover>tbody>tr.active:hover>th {
-    background-color: #e8e8e8
-}
-.table>thead>tr>td.success,
-.table>tbody>tr>td.success,
-.table>tfoot>tr>td.success,
-.table>thead>tr>th.success,
-.table>tbody>tr>th.success,
-.table>tfoot>tr>th.success,
-.table>thead>tr.success>td,
-.table>tbody>tr.success>td,
-.table>tfoot>tr.success>td,
-.table>thead>tr.success>th,
-.table>tbody>tr.success>th,
-.table>tfoot>tr.success>th {
-    background-color: #dff0d8
-}
-.table-hover>tbody>tr>td.success:hover,
-.table-hover>tbody>tr>th.success:hover,
-.table-hover>tbody>tr.success:hover>td,
-.table-hover>tbody>tr:hover>.success,
-.table-hover>tbody>tr.success:hover>th {
-    background-color: #d0e9c6
-}
-.table>thead>tr>td.info,
-.table>tbody>tr>td.info,
-.table>tfoot>tr>td.info,
-.table>thead>tr>th.info,
-.table>tbody>tr>th.info,
-.table>tfoot>tr>th.info,
-.table>thead>tr.info>td,
-.table>tbody>tr.info>td,
-.table>tfoot>tr.info>td,
-.table>thead>tr.info>th,
-.table>tbody>tr.info>th,
-.table>tfoot>tr.info>th {
-    background-color: #d9edf7
-}
-.table-hover>tbody>tr>td.info:hover,
-.table-hover>tbody>tr>th.info:hover,
-.table-hover>tbody>tr.info:hover>td,
-.table-hover>tbody>tr:hover>.info,
-.table-hover>tbody>tr.info:hover>th {
-    background-color: #c4e3f3
-}
-.table>thead>tr>td.warning,
-.table>tbody>tr>td.warning,
-.table>tfoot>tr>td.warning,
-.table>thead>tr>th.warning,
-.table>tbody>tr>th.warning,
-.table>tfoot>tr>th.warning,
-.table>thead>tr.warning>td,
-.table>tbody>tr.warning>td,
-.table>tfoot>tr.warning>td,
-.table>thead>tr.warning>th,
-.table>tbody>tr.warning>th,
-.table>tfoot>tr.warning>th {
-    background-color: #fcf8e3
-}
-.table-hover>tbody>tr>td.warning:hover,
-.table-hover>tbody>tr>th.warning:hover,
-.table-hover>tbody>tr.warning:hover>td,
-.table-hover>tbody>tr:hover>.warning,
-.table-hover>tbody>tr.warning:hover>th {
-    background-color: #faf2cc
-}
-.table>thead>tr>td.danger,
-.table>tbody>tr>td.danger,
-.table>tfoot>tr>td.danger,
-.table>thead>tr>th.danger,
-.table>tbody>tr>th.danger,
-.table>tfoot>tr>th.danger,
-.table>thead>tr.danger>td,
-.table>tbody>tr.danger>td,
-.table>tfoot>tr.danger>td,
-.table>thead>tr.danger>th,
-.table>tbody>tr.danger>th,
-.table>tfoot>tr.danger>th {
-    background-color: #f2dede
-}
-.table-hover>tbody>tr>td.danger:hover,
-.table-hover>tbody>tr>th.danger:hover,
-.table-hover>tbody>tr.danger:hover>td,
-.table-hover>tbody>tr:hover>.danger,
-.table-hover>tbody>tr.danger:hover>th {
-    background-color: #ebcccc
-}
-.table-responsive {
-    overflow-x: auto;
-    min-height: 0.01%
-}
-@media screen and (max-width: 767px) {
-    .table-responsive {
-        width: 100%;
-        margin-bottom: 15.75px;
-        overflow-y: hidden;
-        -ms-overflow-style: -ms-autohiding-scrollbar;
-        border: 1px solid #dddddd
-    }
-    .table-responsive>.table {
-        margin-bottom: 0
-    }
-    .table-responsive>.table>thead>tr>th,
-    .table-responsive>.table>tbody>tr>th,
-    .table-responsive>.table>tfoot>tr>th,
-    .table-responsive>.table>thead>tr>td,
-    .table-responsive>.table>tbody>tr>td,
-    .table-responsive>.table>tfoot>tr>td {
-        white-space: nowrap
-    }
-    .table-responsive>.table-bordered {
-        border: 0
-    }
-    .table-responsive>.table-bordered>thead>tr>th:first-child,
-    .table-responsive>.table-bordered>tbody>tr>th:first-child,
-    .table-responsive>.table-bordered>tfoot>tr>th:first-child,
-    .table-responsive>.table-bordered>thead>tr>td:first-child,
-    .table-responsive>.table-bordered>tbody>tr>td:first-child,
-    .table-responsive>.table-bordered>tfoot>tr>td:first-child {
-        border-left: 0
-    }
-    .table-responsive>.table-bordered>thead>tr>th:last-child,
-    .table-responsive>.table-bordered>tbody>tr>th:last-child,
-    .table-responsive>.table-bordered>tfoot>tr>th:last-child,
-    .table-responsive>.table-bordered>thead>tr>td:last-child,
-    .table-responsive>.table-bordered>tbody>tr>td:last-child,
-    .table-responsive>.table-bordered>tfoot>tr>td:last-child {
-        border-right: 0
-    }
-    .table-responsive>.table-bordered>tbody>tr:last-child>th,
-    .table-responsive>.table-bordered>tfoot>tr:last-child>th,
-    .table-responsive>.table-bordered>tbody>tr:last-child>td,
-    .table-responsive>.table-bordered>tfoot>tr:last-child>td {
-        border-bottom: 0
-    }
-}
-fieldset {
-    padding: 0;
-    margin: 0;
-    border: 0;
-    min-width: 0
-}
-legend {
-    display: block;
-    width: 100%;
-    padding: 0;
-    margin-bottom: 21px;
-    font-size: 22.5px;
-    line-height: inherit;
-    color: #333333;
-    border: 0;
-    border-bottom: 1px solid #e5e5e5
-}
-label {
-    display: inline-block;
-    max-width: 100%;
-    margin-bottom: 5px;
-    font-weight: bold
-}
-input[type="search"] {
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box
-}
-input[type="radio"],
-input[type="checkbox"] {
-    margin: 4px 0 0;
-    margin-top: 1px \9;
-    line-height: normal
-}
-input[type="file"] {
-    display: block
-}
-input[type="range"] {
-    display: block;
-    width: 100%
-}
-select[multiple],
-select[size] {
-    height: auto
-}
-input[type="file"]:focus,
-input[type="radio"]:focus,
-input[type="checkbox"]:focus {
-    outline: thin dotted;
-    outline: 5px auto -webkit-focus-ring-color;
-    outline-offset: -2px
-}
-output {
-    display: block;
-    padding-top: 9px;
-    font-size: 15px;
-    line-height: 1.4;
-    color: #6f6f6f
-}
-.form-control {
-    display: block;
-    width: 100%;
-    height: 39px;
-    padding: 8px 12px;
-    font-size: 15px;
-    line-height: 1.4;
-    color: #6f6f6f;
-    background-color: #ffffff;
-    background-image: none;
-    border: 1px solid #cccccc;
-    border-radius: 0;
-    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-    box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-    -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
-    -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-    transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s
-}
-.form-control:focus {
-    border-color: #66afe9;
-    outline: 0;
-    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6);
-    box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6)
-}
-.form-control::-moz-placeholder {
-    color: #999999;
-    opacity: 1
-}
-.form-control:-ms-input-placeholder {
-    color: #999999
-}
-.form-control::-webkit-input-placeholder {
-    color: #999999
-}
-.form-control[disabled],
-.form-control[readonly],
-fieldset[disabled] .form-control {
-    cursor: not-allowed;
-    background-color: #eeeeee;
-    opacity: 1
-}
-textarea.form-control {
-    height: auto
-}
-input[type="search"] {
-    -webkit-appearance: none
-}
-@media screen and (-webkit-min-device-pixel-ratio: 0) {
-    input[type="date"],
-    input[type="time"],
-    input[type="datetime-local"],
-    input[type="month"] {
-        line-height: 39px
-    }
-    input[type="date"].input-sm,
-    input[type="time"].input-sm,
-    input[type="datetime-local"].input-sm,
-    input[type="month"].input-sm {
-        line-height: 36px
-    }
-    input[type="date"].input-lg,
-    input[type="time"].input-lg,
-    input[type="datetime-local"].input-lg,
-    input[type="month"].input-lg {
-        line-height: 60px
-    }
-}
-.form-group {
-    margin-bottom: 15px
-}
-.radio,
-.checkbox {
-    position: relative;
-    display: block;
-    margin-top: 10px;
-    margin-bottom: 10px
-}
-.radio label,
-.checkbox label {
-    min-height: 21px;
-    padding-left: 20px;
-    margin-bottom: 0;
-    font-weight: normal;
-    cursor: pointer
-}
-.radio input[type="radio"],
-.radio-inline input[type="radio"],
-.checkbox input[type="checkbox"],
-.checkbox-inline input[type="checkbox"] {
-    position: absolute;
-    margin-left: -20px;
-    margin-top: 4px \9
-}
-.radio+.radio,
-.checkbox+.checkbox {
-    margin-top: -5px
-}
-.radio-inline,
-.checkbox-inline {
-    display: inline-block;
-    padding-left: 20px;
-    margin-bottom: 0;
-    vertical-align: middle;
-    font-weight: normal;
-    cursor: pointer
-}
-.radio-inline+.radio-inline,
-.checkbox-inline+.checkbox-inline {
-    margin-top: 0;
-    margin-left: 10px
-}
-input[type="radio"][disabled],
-input[type="checkbox"][disabled],
-input[type="radio"].disabled,
-input[type="checkbox"].disabled,
-fieldset[disabled] input[type="radio"],
-fieldset[disabled] input[type="checkbox"] {
-    cursor: not-allowed
-}
-.radio-inline.disabled,
-.checkbox-inline.disabled,
-fieldset[disabled] .radio-inline,
-fieldset[disabled] .checkbox-inline {
-    cursor: not-allowed
-}
-.radio.disabled label,
-.checkbox.disabled label,
-fieldset[disabled] .radio label,
-fieldset[disabled] .checkbox label {
-    cursor: not-allowed
-}
-.form-control-static {
-    padding-top: 9px;
-    padding-bottom: 9px;
-    margin-bottom: 0
-}
-.form-control-static.input-lg,
-.form-control-static.input-sm {
-    padding-left: 0;
-    padding-right: 0
-}
-.input-sm,
-.form-group-sm .form-control {
-    height: 36px;
-    padding: 8px 12px;
-    font-size: 12px;
-    line-height: 1.5;
-    border-radius: 0
-}
-select.input-sm,
-select.form-group-sm .form-control {
-    height: 36px;
-    line-height: 36px
-}
-textarea.input-sm,
-textarea.form-group-sm .form-control,
-select[multiple].input-sm,
-select[multiple].form-group-sm .form-control {
-    height: auto
-}
-.input-lg,
-.form-group-lg .form-control {
-    height: 60px;
-    padding: 16px 20px;
-    font-size: 19px;
-    line-height: 1.33;
-    border-radius: 0
-}
-select.input-lg,
-select.form-group-lg .form-control {
-    height: 60px;
-    line-height: 60px
-}
-textarea.input-lg,
-textarea.form-group-lg .form-control,
-select[multiple].input-lg,
-select[multiple].form-group-lg .form-control {
-    height: auto
-}
-.has-feedback {
-    position: relative
-}
-.has-feedback .form-control {
-    padding-right: 48.75px
-}
-.form-control-feedback {
-    position: absolute;
-    top: 0;
-    right: 0;
-    z-index: 2;
-    display: block;
-    width: 39px;
-    height: 39px;
-    line-height: 39px;
-    text-align: center;
-    pointer-events: none
-}
-.input-lg+.form-control-feedback {
-    width: 60px;
-    height: 60px;
-    line-height: 60px
-}
-.input-sm+.form-control-feedback {
-    width: 36px;
-    height: 36px;
-    line-height: 36px
-}
-.has-success .help-block,
-.has-success .control-label,
-.has-success .radio,
-.has-success .checkbox,
-.has-success .radio-inline,
-.has-success .checkbox-inline,
-.has-success.radio label,
-.has-success.checkbox label,
-.has-success.radio-inline label,
-.has-success.checkbox-inline label {
-    color: #43ac6a
-}
-.has-success .form-control {
-    border-color: #43ac6a;
-    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-    box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075)
-}
-.has-success .form-control:focus {
-    border-color: #358753;
-    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #85d0a1;
-    box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #85d0a1
-}
-.has-success .input-group-addon {
-    color: #43ac6a;
-    border-color: #43ac6a;
-    background-color: #dff0d8
-}
-.has-success .form-control-feedback {
-    color: #43ac6a
-}
-.has-warning .help-block,
-.has-warning .control-label,
-.has-warning .radio,
-.has-warning .checkbox,
-.has-warning .radio-inline,
-.has-warning .checkbox-inline,
-.has-warning.radio label,
-.has-warning.checkbox label,
-.has-warning.radio-inline label,
-.has-warning.checkbox-inline label {
-    color: #e99002
-}
-.has-warning .form-control {
-    border-color: #e99002;
-    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-    box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075)
-}
-.has-warning .form-control:focus {
-    border-color: #b67102;
-    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #febc53;
-    box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #febc53
-}
-.has-warning .input-group-addon {
-    color: #e99002;
-    border-color: #e99002;
-    background-color: #fcf8e3
-}
-.has-warning .form-control-feedback {
-    color: #e99002
-}
-.has-error .help-block,
-.has-error .control-label,
-.has-error .radio,
-.has-error .checkbox,
-.has-error .radio-inline,
-.has-error .checkbox-inline,
-.has-error.radio label,
-.has-error.checkbox label,
-.has-error.radio-inline label,
-.has-error.checkbox-inline label {
-    color: #f04124
-}
-.has-error .form-control {
-    border-color: #f04124;
-    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-    box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075)
-}
-.has-error .form-control:focus {
-    border-color: #d32a0e;
-    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #f79483;
-    box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #f79483
-}
-.has-error .input-group-addon {
-    color: #f04124;
-    border-color: #f04124;
-    background-color: #f2dede
-}
-.has-error .form-control-feedback {
-    color: #f04124
-}
-.has-feedback label~.form-control-feedback {
-    top: 26px
-}
-.has-feedback label.sr-only~.form-control-feedback {
-    top: 0
-}
-.help-block {
-    display: block;
-    margin-top: 5px;
-    margin-bottom: 10px;
-    color: #626262
-}
-@media (min-width: 768px) {
-    .form-inline .form-group {
-        display: inline-block;
-        margin-bottom: 0;
-        vertical-align: middle
-    }
-    .form-inline .form-control {
-        display: inline-block;
-        width: auto;
-        vertical-align: middle
-    }
-    .form-inline .form-control-static {
-        display: inline-block
-    }
-    .form-inline .input-group {
-        display: inline-table;
-        vertical-align: middle
-    }
-    .form-inline .input-group .input-group-addon,
-    .form-inline .input-group .input-group-btn,
-    .form-inline .input-group .form-control {
-        width: auto
-    }
-    .form-inline .input-group>.form-control {
-        width: 100%
-    }
-    .form-inline .control-label {
-        margin-bottom: 0;
-        vertical-align: middle
-    }
-    .form-inline .radio,
-    .form-inline .checkbox {
-        display: inline-block;
-        margin-top: 0;
-        margin-bottom: 0;
-        vertical-align: middle
-    }
-    .form-inline .radio label,
-    .form-inline .checkbox label {
-        padding-left: 0
-    }
-    .form-inline .radio input[type="radio"],
-    .form-inline .checkbox input[type="checkbox"] {
-        position: relative;
-        margin-left: 0
-    }
-    .form-inline .has-feedback .form-control-feedback {
-        top: 0
-    }
-}
-.form-horizontal .radio,
-.form-horizontal .checkbox,
-.form-horizontal .radio-inline,
-.form-horizontal .checkbox-inline {
-    margin-top: 0;
-    margin-bottom: 0;
-    padding-top: 9px
-}
-.form-horizontal .radio,
-.form-horizontal .checkbox {
-    min-height: 30px
-}
-.form-horizontal .form-group {
-    margin-left: -15px;
-    margin-right: -15px
-}
-@media (min-width: 768px) {
-    .form-horizontal .control-label {
-        text-align: right;
-        margin-bottom: 0;
-        padding-top: 9px
-    }
-}
-.form-horizontal .has-feedback .form-control-feedback {
-    right: 15px
-}
-@media (min-width: 768px) {
-    .form-horizontal .form-group-lg .control-label {
-        padding-top: 22.28px
-    }
-}
-@media (min-width: 768px) {
-    .form-horizontal .form-group-sm .control-label {
-        padding-top: 9px
-    }
-}
-.btn {
-    display: inline-block;
-    margin-bottom: 0;
-    font-weight: normal;
-    text-align: center;
-    vertical-align: middle;
-    -ms-touch-action: manipulation;
-    touch-action: manipulation;
-    cursor: pointer;
-    background-image: none;
-    border: 1px solid transparent;
-    white-space: nowrap;
-    padding: 8px 12px;
-    font-size: 15px;
-    line-height: 1.4;
-    border-radius: 0;
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none
-}
-.btn:focus,
-.btn:active:focus,
-.btn.active:focus,
-.btn.focus,
-.btn:active.focus,
-.btn.active.focus {
-    outline: thin dotted;
-    outline: 5px auto -webkit-focus-ring-color;
-    outline-offset: -2px
-}
-.btn:hover,
-.btn:focus,
-.btn.focus {
-    color: #333333;
-    text-decoration: none
-}
-.btn:active,
-.btn.active {
-    outline: 0;
-    background-image: none;
-    -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
-    box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125)
-}
-.btn.disabled,
-.btn[disabled],
-fieldset[disabled] .btn {
-    cursor: not-allowed;
-    pointer-events: none;
-    opacity: 0.65;
-    filter: alpha(opacity=65);
-    -webkit-box-shadow: none;
-    box-shadow: none
-}
-.btn-default {
-    color: #333333;
-    background-color: #e7e7e7;
-    border-color: #cccccc
-}
-.btn-default:hover,
-.btn-default:focus,
-.btn-default.focus,
-.btn-default:active,
-.btn-default.active,
-.open>.dropdown-toggle.btn-default {
-    color: #333333;
-    background-color: #cecece;
-    border-color: #adadad
-}
-.btn-default:active,
-.btn-default.active,
-.open>.dropdown-toggle.btn-default {
-    background-image: none
-}
-.btn-default.disabled,
-.btn-default[disabled],
-fieldset[disabled] .btn-default,
-.btn-default.disabled:hover,
-.btn-default[disabled]:hover,
-fieldset[disabled] .btn-default:hover,
-.btn-default.disabled:focus,
-.btn-default[disabled]:focus,
-fieldset[disabled] .btn-default:focus,
-.btn-default.disabled.focus,
-.btn-default[disabled].focus,
-fieldset[disabled] .btn-default.focus,
-.btn-default.disabled:active,
-.btn-default[disabled]:active,
-fieldset[disabled] .btn-default:active,
-.btn-default.disabled.active,
-.btn-default[disabled].active,
-fieldset[disabled] .btn-default.active {
-    background-color: #e7e7e7;
-    border-color: #cccccc
-}
-.btn-default .badge {
-    color: #e7e7e7;
-    background-color: #333333
-}
-.btn-primary {
-    color: #ffffff;
-    background-color: #008cba;
-    border-color: #0079a1
-}
-.btn-primary:hover,
-.btn-primary:focus,
-.btn-primary.focus,
-.btn-primary:active,
-.btn-primary.active,
-.open>.dropdown-toggle.btn-primary {
-    color: #ffffff;
-    background-color: #006687;
-    border-color: #004b63
-}
-.btn-primary:active,
-.btn-primary.active,
-.open>.dropdown-toggle.btn-primary {
-    background-image: none
-}
-.btn-primary.disabled,
-.btn-primary[disabled],
-fieldset[disabled] .btn-primary,
-.btn-primary.disabled:hover,
-.btn-primary[disabled]:hover,
-fieldset[disabled] .btn-primary:hover,
-.btn-primary.disabled:focus,
-.btn-primary[disabled]:focus,
-fieldset[disabled] .btn-primary:focus,
-.btn-primary.disabled.focus,
-.btn-primary[disabled].focus,
-fieldset[disabled] .btn-primary.focus,
-.btn-primary.disabled:active,
-.btn-primary[disabled]:active,
-fieldset[disabled] .btn-primary:active,
-.btn-primary.disabled.active,
-.btn-primary[disabled].active,
-fieldset[disabled] .btn-primary.active {
-    background-color: #008cba;
-    border-color: #0079a1
-}
-.btn-primary .badge {
-    color: #008cba;
-    background-color: #ffffff
-}
-.btn-success {
-    color: #ffffff;
-    background-color: #43ac6a;
-    border-color: #3c9a5f
-}
-.btn-success:hover,
-.btn-success:focus,
-.btn-success.focus,
-.btn-success:active,
-.btn-success.active,
-.open>.dropdown-toggle.btn-success {
-    color: #ffffff;
-    background-color: #358753;
-    border-color: #2b6e44
-}
-.btn-success:active,
-.btn-success.active,
-.open>.dropdown-toggle.btn-success {
-    background-image: none
-}
-.btn-success.disabled,
-.btn-success[disabled],
-fieldset[disabled] .btn-success,
-.btn-success.disabled:hover,
-.btn-success[disabled]:hover,
-fieldset[disabled] .btn-success:hover,
-.btn-success.disabled:focus,
-.btn-success[disabled]:focus,
-fieldset[disabled] .btn-success:focus,
-.btn-success.disabled.focus,
-.btn-success[disabled].focus,
-fieldset[disabled] .btn-success.focus,
-.btn-success.disabled:active,
-.btn-success[disabled]:active,
-fieldset[disabled] .btn-success:active,
-.btn-success.disabled.active,
-.btn-success[disabled].active,
-fieldset[disabled] .btn-success.active {
-    background-color: #43ac6a;
-    border-color: #3c9a5f
-}
-.btn-success .badge {
-    color: #43ac6a;
-    background-color: #ffffff
-}
-.btn-info {
-    color: #ffffff;
-    background-color: #5bc0de;
-    border-color: #46b8da
-}
-.btn-info:hover,
-.btn-info:focus,
-.btn-info.focus,
-.btn-info:active,
-.btn-info.active,
-.open>.dropdown-toggle.btn-info {
-    color: #ffffff;
-    background-color: #31b0d5;
-    border-color: #269abc
-}
-.btn-info:active,
-.btn-info.active,
-.open>.dropdown-toggle.btn-info {
-    background-image: none
-}
-.btn-info.disabled,
-.btn-info[disabled],
-fieldset[disabled] .btn-info,
-.btn-info.disabled:hover,
-.btn-info[disabled]:hover,
-fieldset[disabled] .btn-info:hover,
-.btn-info.disabled:focus,
-.btn-info[disabled]:focus,
-fieldset[disabled] .btn-info:focus,
-.btn-info.disabled.focus,
-.btn-info[disabled].focus,
-fieldset[disabled] .btn-info.focus,
-.btn-info.disabled:active,
-.btn-info[disabled]:active,
-fieldset[disabled] .btn-info:active,
-.btn-info.disabled.active,
-.btn-info[disabled].active,
-fieldset[disabled] .btn-info.active {
-    background-color: #5bc0de;
-    border-color: #46b8da
-}
-.btn-info .badge {
-    color: #5bc0de;
-    background-color: #ffffff
-}
-.btn-warning {
-    color: #ffffff;
-    background-color: #e99002;
-    border-color: #d08002
-}
-.btn-warning:hover,
-.btn-warning:focus,
-.btn-warning.focus,
-.btn-warning:active,
-.btn-warning.active,
-.open>.dropdown-toggle.btn-warning {
-    color: #ffffff;
-    background-color: #b67102;
-    border-color: #935b01
-}
-.btn-warning:active,
-.btn-warning.active,
-.open>.dropdown-toggle.btn-warning {
-    background-image: none
-}
-.btn-warning.disabled,
-.btn-warning[disabled],
-fieldset[disabled] .btn-warning,
-.btn-warning.disabled:hover,
-.btn-warning[disabled]:hover,
-fieldset[disabled] .btn-warning:hover,
-.btn-warning.disabled:focus,
-.btn-warning[disabled]:focus,
-fieldset[disabled] .btn-warning:focus,
-.btn-warning.disabled.focus,
-.btn-warning[disabled].focus,
-fieldset[disabled] .btn-warning.focus,
-.btn-warning.disabled:active,
-.btn-warning[disabled]:active,
-fieldset[disabled] .btn-warning:active,
-.btn-warning.disabled.active,
-.btn-warning[disabled].active,
-fieldset[disabled] .btn-warning.active {
-    background-color: #e99002;
-    border-color: #d08002
-}
-.btn-warning .badge {
-    color: #e99002;
-    background-color: #ffffff
-}
-.btn-danger {
-    color: #ffffff;
-    background-color: #f04124;
-    border-color: #ea2f10
-}
-.btn-danger:hover,
-.btn-danger:focus,
-.btn-danger.focus,
-.btn-danger:active,
-.btn-danger.active,
-.open>.dropdown-toggle.btn-danger {
-    color: #ffffff;
-    background-color: #d32a0e;
-    border-color: #b1240c
-}
-.btn-danger:active,
-.btn-danger.active,
-.open>.dropdown-toggle.btn-danger {
-    background-image: none
-}
-.btn-danger.disabled,
-.btn-danger[disabled],
-fieldset[disabled] .btn-danger,
-.btn-danger.disabled:hover,
-.btn-danger[disabled]:hover,
-fieldset[disabled] .btn-danger:hover,
-.btn-danger.disabled:focus,
-.btn-danger[disabled]:focus,
-fieldset[disabled] .btn-danger:focus,
-.btn-danger.disabled.focus,
-.btn-danger[disabled].focus,
-fieldset[disabled] .btn-danger.focus,
-.btn-danger.disabled:active,
-.btn-danger[disabled]:active,
-fieldset[disabled] .btn-danger:active,
-.btn-danger.disabled.active,
-.btn-danger[disabled].active,
-fieldset[disabled] .btn-danger.active {
-    background-color: #f04124;
-    border-color: #ea2f10
-}
-.btn-danger .badge {
-    color: #f04124;
-    background-color: #ffffff
-}
-.btn-link {
-    color: #008cba;
-    font-weight: normal;
-    border-radius: 0
-}
-.btn-link,
-.btn-link:active,
-.btn-link.active,
-.btn-link[disabled],
-fieldset[disabled] .btn-link {
-    background-color: transparent;
-    -webkit-box-shadow: none;
-    box-shadow: none
-}
-.btn-link,
-.btn-link:hover,
-.btn-link:focus,
-.btn-link:active {
-    border-color: transparent
-}
-.btn-link:hover,
-.btn-link:focus {
-    color: #00526e;
-    text-decoration: underline;
-    background-color: transparent
-}
-.btn-link[disabled]:hover,
-fieldset[disabled] .btn-link:hover,
-.btn-link[disabled]:focus,
-fieldset[disabled] .btn-link:focus {
-    color: #999999;
-    text-decoration: none
-}
-.btn-lg,
-.btn-group-lg>.btn {
-    padding: 16px 20px;
-    font-size: 19px;
-    line-height: 1.33;
-    border-radius: 0
-}
-.btn-sm,
-.btn-group-sm>.btn {
-    padding: 8px 12px;
-    font-size: 12px;
-    line-height: 1.5;
-    border-radius: 0
-}
-.btn-xs,
-.btn-group-xs>.btn {
-    padding: 4px 6px;
-    font-size: 12px;
-    line-height: 1.5;
-    border-radius: 0
-}
-.btn-block {
-    display: block;
-    width: 100%
-}
-.btn-block+.btn-block {
-    margin-top: 5px
-}
-input[type="submit"].btn-block,
-input[type="reset"].btn-block,
-input[type="button"].btn-block {
-    width: 100%
-}
-.fade {
-    opacity: 0;
-    -webkit-transition: opacity 0.15s linear;
-    -o-transition: opacity 0.15s linear;
-    transition: opacity 0.15s linear
-}
-.fade.in {
-    opacity: 1
-}
-.collapse {
-    display: none;
-    visibility: hidden
-}
-.collapse.in {
-    display: block;
-    visibility: visible
-}
-tr.collapse.in {
-    display: table-row
-}
-tbody.collapse.in {
-    display: table-row-group
-}
-.collapsing {
-    position: relative;
-    height: 0;
-    overflow: hidden;
-    -webkit-transition-property: height, visibility;
-    -o-transition-property: height, visibility;
-    transition-property: height, visibility;
-    -webkit-transition-duration: 0.35s;
-    -o-transition-duration: 0.35s;
-    transition-duration: 0.35s;
-    -webkit-transition-timing-function: ease;
-    -o-transition-timing-function: ease;
-    transition-timing-function: ease
-}
-.caret {
-    display: inline-block;
-    width: 0;
-    height: 0;
-    margin-left: 2px;
-    vertical-align: middle;
-    border-top: 4px solid;
-    border-right: 4px solid transparent;
-    border-left: 4px solid transparent
-}
-.dropdown {
-    position: relative
-}
-.dropdown-toggle:focus {
-    outline: 0
-}
-.dropdown-menu {
-    position: absolute;
-    top: 100%;
-    left: 0;
-    z-index: 1000;
-    display: none;
-    float: left;
-    min-width: 160px;
-    padding: 5px 0;
-    margin: 2px 0 0;
-    list-style: none;
-    font-size: 15px;
-    text-align: left;
-    background-color: #ffffff;
-    border: 1px solid #cccccc;
-    border: 1px solid rgba(0, 0, 0, 0.15);
-    border-radius: 0;
-    -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
-    box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
-    -webkit-background-clip: padding-box;
-    background-clip: padding-box
-}
-.dropdown-menu.pull-right {
-    right: 0;
-    left: auto
-}
-.dropdown-menu .divider {
-    height: 1px;
-    margin: 9.5px 0;
-    overflow: hidden;
-    background-color: rgba(0, 0, 0, 0.2)
-}
-.dropdown-menu>li>a {
-    display: block;
-    padding: 3px 20px;
-    clear: both;
-    font-weight: normal;
-    line-height: 1.4;
-    color: #555555;
-    white-space: nowrap
-}
-.dropdown-menu>li>a:hover,
-.dropdown-menu>li>a:focus {
-    text-decoration: none;
-    color: #262626;
-    background-color: #eeeeee
-}
-.dropdown-menu>.active>a,
-.dropdown-menu>.active>a:hover,
-.dropdown-menu>.active>a:focus {
-    color: #ffffff;
-    text-decoration: none;
-    outline: 0;
-    background-color: #008cba
-}
-.dropdown-menu>.disabled>a,
-.dropdown-menu>.disabled>a:hover,
-.dropdown-menu>.disabled>a:focus {
-    color: #999999
-}
-.dropdown-menu>.disabled>a:hover,
-.dropdown-menu>.disabled>a:focus {
-    text-decoration: none;
-    background-color: transparent;
-    background-image: none;
-    filter: progid: DXImageTransform.Microsoft.gradient(enabled=false);
-    cursor: not-allowed
-}
-.open>.dropdown-menu {
-    display: block
-}
-.open>a {
-    outline: 0
-}
-.dropdown-menu-right {
-    left: auto;
-    right: 0
-}
-.dropdown-menu-left {
-    left: 0;
-    right: auto
-}
-.dropdown-header {
-    display: block;
-    padding: 3px 20px;
-    font-size: 12px;
-    line-height: 1.4;
-    color: #999999;
-    white-space: nowrap
-}
-.dropdown-backdrop {
-    position: fixed;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    top: 0;
-    z-index: 990
-}
-.pull-right>.dropdown-menu {
-    right: 0;
-    left: auto
-}
-.dropup .caret,
-.navbar-fixed-bottom .dropdown .caret {
-    border-top: 0;
-    border-bottom: 4px solid;
-    content: ""
-}
-.dropup .dropdown-menu,
-.navbar-fixed-bottom .dropdown .dropdown-menu {
-    top: auto;
-    bottom: 100%;
-    margin-bottom: 1px
-}
-@media (min-width: 768px) {
-    .navbar-right .dropdown-menu {
-        left: auto;
-        right: 0
-    }
-    .navbar-right .dropdown-menu-left {
-        left: 0;
-        right: auto
-    }
-}
-.btn-group,
-.btn-group-vertical {
-    position: relative;
-    display: inline-block;
-    vertical-align: middle
-}
-.btn-group>.btn,
-.btn-group-vertical>.btn {
-    position: relative;
-    float: left
-}
-.btn-group>.btn:hover,
-.btn-group-vertical>.btn:hover,
-.btn-group>.btn:focus,
-.btn-group-vertical>.btn:focus,
-.btn-group>.btn:active,
-.btn-group-vertical>.btn:active,
-.btn-group>.btn.active,
-.btn-group-vertical>.btn.active {
-    z-index: 2
-}
-.btn-group .btn+.btn,
-.btn-group .btn+.btn-group,
-.btn-group .btn-group+.btn,
-.btn-group .btn-group+.btn-group {
-    margin-left: -1px
-}
-.btn-toolbar {
-    margin-left: -5px
-}
-.btn-toolbar .btn-group,
-.btn-toolbar .input-group {
-    float: left
-}
-.btn-toolbar>.btn,
-.btn-toolbar>.btn-group,
-.btn-toolbar>.input-group {
-    margin-left: 5px
-}
-.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
-    border-radius: 0
-}
-.btn-group>.btn:first-child {
-    margin-left: 0
-}
-.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle) {
-    border-bottom-right-radius: 0;
-    border-top-right-radius: 0
-}
-.btn-group>.btn:last-child:not(:first-child),
-.btn-group>.dropdown-toggle:not(:first-child) {
-    border-bottom-left-radius: 0;
-    border-top-left-radius: 0
-}
-.btn-group>.btn-group {
-    float: left
-}
-.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn {
-    border-radius: 0
-}
-.btn-group>.btn-group:first-child>.btn:last-child,
-.btn-group>.btn-group:first-child>.dropdown-toggle {
-    border-bottom-right-radius: 0;
-    border-top-right-radius: 0
-}
-.btn-group>.btn-group:last-child>.btn:first-child {
-    border-bottom-left-radius: 0;
-    border-top-left-radius: 0
-}
-.btn-group .dropdown-toggle:active,
-.btn-group.open .dropdown-toggle {
-    outline: 0
-}
-.btn-group>.btn+.dropdown-toggle {
-    padding-left: 8px;
-    padding-right: 8px
-}
-.btn-group>.btn-lg+.dropdown-toggle {
-    padding-left: 12px;
-    padding-right: 12px
-}
-.btn-group.open .dropdown-toggle {
-    -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
-    box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125)
-}
-.btn-group.open .dropdown-toggle.btn-link {
-    -webkit-box-shadow: none;
-    box-shadow: none
-}
-.btn .caret {
-    margin-left: 0
-}
-.btn-lg .caret {
-    border-width: 5px 5px 0;
-    border-bottom-width: 0
-}
-.dropup .btn-lg .caret {
-    border-width: 0 5px 5px
-}
-.btn-group-vertical>.btn,
-.btn-group-vertical>.btn-group,
-.btn-group-vertical>.btn-group>.btn {
-    display: block;
-    float: none;
-    width: 100%;
-    max-width: 100%
-}
-.btn-group-vertical>.btn-group>.btn {
-    float: none
-}
-.btn-group-vertical>.btn+.btn,
-.btn-group-vertical>.btn+.btn-group,
-.btn-group-vertical>.btn-group+.btn,
-.btn-group-vertical>.btn-group+.btn-group {
-    margin-top: -1px;
-    margin-left: 0
-}
-.btn-group-vertical>.btn:not(:first-child):not(:last-child) {
-    border-radius: 0
-}
-.btn-group-vertical>.btn:first-child:not(:last-child) {
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-    border-bottom-left-radius: 0
-}
-.btn-group-vertical>.btn:last-child:not(:first-child) {
-    border-bottom-left-radius: 0;
-    border-top-right-radius: 0;
-    border-top-left-radius: 0
-}
-.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn {
-    border-radius: 0
-}
-.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,
-.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle {
-    border-bottom-right-radius: 0;
-    border-bottom-left-radius: 0
-}
-.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child {
-    border-top-right-radius: 0;
-    border-top-left-radius: 0
-}
-.btn-group-justified {
-    display: table;
-    width: 100%;
-    table-layout: fixed;
-    border-collapse: separate
-}
-.btn-group-justified>.btn,
-.btn-group-justified>.btn-group {
-    float: none;
-    display: table-cell;
-    width: 1%
-}
-.btn-group-justified>.btn-group .btn {
-    width: 100%
-}
-.btn-group-justified>.btn-group .dropdown-menu {
-    left: auto
-}
-[data-toggle="buttons"]>.btn input[type="radio"],
-[data-toggle="buttons"]>.btn-group>.btn input[type="radio"],
-[data-toggle="buttons"]>.btn input[type="checkbox"],
-[data-toggle="buttons"]>.btn-group>.btn input[type="checkbox"] {
-    position: absolute;
-    clip: rect(0, 0, 0, 0);
-    pointer-events: none
-}
-.input-group {
-    position: relative;
-    display: table;
-    border-collapse: separate
-}
-.input-group[class*="col-"] {
-    float: none;
-    padding-left: 0;
-    padding-right: 0
-}
-.input-group .form-control {
-    position: relative;
-    z-index: 2;
-    float: left;
-    width: 100%;
-    margin-bottom: 0
-}
-.input-group-lg>.form-control,
-.input-group-lg>.input-group-addon,
-.input-group-lg>.input-group-btn>.btn {
-    height: 60px;
-    padding: 16px 20px;
-    font-size: 19px;
-    line-height: 1.33;
-    border-radius: 0
-}
-select.input-group-lg>.form-control,
-select.input-group-lg>.input-group-addon,
-select.input-group-lg>.input-group-btn>.btn {
-    height: 60px;
-    line-height: 60px
-}
-textarea.input-group-lg>.form-control,
-textarea.input-group-lg>.input-group-addon,
-textarea.input-group-lg>.input-group-btn>.btn,
-select[multiple].input-group-lg>.form-control,
-select[multiple].input-group-lg>.input-group-addon,
-select[multiple].input-group-lg>.input-group-btn>.btn {
-    height: auto
-}
-.input-group-sm>.form-control,
-.input-group-sm>.input-group-addon,
-.input-group-sm>.input-group-btn>.btn {
-    height: 36px;
-    padding: 8px 12px;
-    font-size: 12px;
-    line-height: 1.5;
-    border-radius: 0
-}
-select.input-group-sm>.form-control,
-select.input-group-sm>.input-group-addon,
-select.input-group-sm>.input-group-btn>.btn {
-    height: 36px;
-    line-height: 36px
-}
-textarea.input-group-sm>.form-control,
-textarea.input-group-sm>.input-group-addon,
-textarea.input-group-sm>.input-group-btn>.btn,
-select[multiple].input-group-sm>.form-control,
-select[multiple].input-group-sm>.input-group-addon,
-select[multiple].input-group-sm>.input-group-btn>.btn {
-    height: auto
-}
-.input-group-addon,
-.input-group-btn,
-.input-group .form-control {
-    display: table-cell
-}
-.input-group-addon:not(:first-child):not(:last-child),
-.input-group-btn:not(:first-child):not(:last-child),
-.input-group .form-control:not(:first-child):not(:last-child) {
-    border-radius: 0
-}
-.input-group-addon,
-.input-group-btn {
-    width: 1%;
-    white-space: nowrap;
-    vertical-align: middle
-}
-.input-group-addon {
-    padding: 8px 12px;
-    font-size: 15px;
-    font-weight: normal;
-    line-height: 1;
-    color: #6f6f6f;
-    text-align: center;
-    background-color: #eeeeee;
-    border: 1px solid #cccccc;
-    border-radius: 0
-}
-.input-group-addon.input-sm {
-    padding: 8px 12px;
-    font-size: 12px;
-    border-radius: 0
-}
-.input-group-addon.input-lg {
-    padding: 16px 20px;
-    font-size: 19px;
-    border-radius: 0
-}
-.input-group-addon input[type="radio"],
-.input-group-addon input[type="checkbox"] {
-    margin-top: 0
-}
-.input-group .form-control:first-child,
-.input-group-addon:first-child,
-.input-group-btn:first-child>.btn,
-.input-group-btn:first-child>.btn-group>.btn,
-.input-group-btn:first-child>.dropdown-toggle,
-.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle),
-.input-group-btn:last-child>.btn-group:not(:last-child)>.btn {
-    border-bottom-right-radius: 0;
-    border-top-right-radius: 0
-}
-.input-group-addon:first-child {
-    border-right: 0
-}
-.input-group .form-control:last-child,
-.input-group-addon:last-child,
-.input-group-btn:last-child>.btn,
-.input-group-btn:last-child>.btn-group>.btn,
-.input-group-btn:last-child>.dropdown-toggle,
-.input-group-btn:first-child>.btn:not(:first-child),
-.input-group-btn:first-child>.btn-group:not(:first-child)>.btn {
-    border-bottom-left-radius: 0;
-    border-top-left-radius: 0
-}
-.input-group-addon:last-child {
-    border-left: 0
-}
-.input-group-btn {
-    position: relative;
-    font-size: 0;
-    white-space: nowrap
-}
-.input-group-btn>.btn {
-    position: relative
-}
-.input-group-btn>.btn+.btn {
-    margin-left: -1px
-}
-.input-group-btn>.btn:hover,
-.input-group-btn>.btn:focus,
-.input-group-btn>.btn:active {
-    z-index: 2
-}
-.input-group-btn:first-child>.btn,
-.input-group-btn:first-child>.btn-group {
-    margin-right: -1px
-}
-.input-group-btn:last-child>.btn,
-.input-group-btn:last-child>.btn-group {
-    margin-left: -1px
-}
-.nav {
-    margin-bottom: 0;
-    padding-left: 0;
-    list-style: none
-}
-.nav>li {
-    position: relative;
-    display: block
-}
-.nav>li>a {
-    position: relative;
-    display: block;
-    padding: 10px 15px
-}
-.nav>li>a:hover,
-.nav>li>a:focus {
-    text-decoration: none;
-    background-color: #eeeeee
-}
-.nav>li.disabled>a {
-    color: #999999
-}
-.nav>li.disabled>a:hover,
-.nav>li.disabled>a:focus {
-    color: #999999;
-    text-decoration: none;
-    background-color: transparent;
-    cursor: not-allowed
-}
-.nav .open>a,
-.nav .open>a:hover,
-.nav .open>a:focus {
-    background-color: #eeeeee;
-    border-color: #008cba
-}
-.nav .nav-divider {
-    height: 1px;
-    margin: 9.5px 0;
-    overflow: hidden;
-    background-color: #e5e5e5
-}
-.nav>li>a>img {
-    max-width: none
-}
-.nav-tabs {
-    border-bottom: 1px solid #dddddd
-}
-.nav-tabs>li {
-    float: left;
-    margin-bottom: -1px
-}
-.nav-tabs>li>a {
-    margin-right: 2px;
-    line-height: 1.4;
-    border: 1px solid transparent;
-    border-radius: 0 0 0 0
-}
-.nav-tabs>li>a:hover {
-    border-color: #eeeeee #eeeeee #dddddd
-}
-.nav-tabs>li.active>a,
-.nav-tabs>li.active>a:hover,
-.nav-tabs>li.active>a:focus {
-    color: #6f6f6f;
-    background-color: #ffffff;
-    border: 1px solid #dddddd;
-    border-bottom-color: transparent;
-    cursor: default
-}
-.nav-tabs.nav-justified {
-    width: 100%;
-    border-bottom: 0
-}
-.nav-tabs.nav-justified>li {
-    float: none
-}
-.nav-tabs.nav-justified>li>a {
-    text-align: center;
-    margin-bottom: 5px
-}
-.nav-tabs.nav-justified>.dropdown .dropdown-menu {
-    top: auto;
-    left: auto
-}
-@media (min-width: 768px) {
-    .nav-tabs.nav-justified>li {
-        display: table-cell;
-        width: 1%
-    }
-    .nav-tabs.nav-justified>li>a {
-        margin-bottom: 0
-    }
-}
-.nav-tabs.nav-justified>li>a {
-    margin-right: 0;
-    border-radius: 0
-}
-.nav-tabs.nav-justified>.active>a,
-.nav-tabs.nav-justified>.active>a:hover,
-.nav-tabs.nav-justified>.active>a:focus {
-    border: 1px solid #dddddd
-}
-@media (min-width: 768px) {
-    .nav-tabs.nav-justified>li>a {
-        border-bottom: 1px solid #dddddd;
-        border-radius: 0 0 0 0
-    }
-    .nav-tabs.nav-justified>.active>a,
-    .nav-tabs.nav-justified>.active>a:hover,
-    .nav-tabs.nav-justified>.active>a:focus {
-        border-bottom-color: #ffffff
-    }
-}
-.nav-pills>li {
-    float: left
-}
-.nav-pills>li>a {
-    border-radius: 0
-}
-.nav-pills>li+li {
-    margin-left: 2px
-}
-.nav-pills>li.active>a,
-.nav-pills>li.active>a:hover,
-.nav-pills>li.active>a:focus {
-    color: #ffffff;
-    background-color: #008cba
-}
-.nav-stacked>li {
-    float: none
-}
-.nav-stacked>li+li {
-    margin-top: 2px;
-    margin-left: 0
-}
-.nav-justified {
-    width: 100%
-}
-.nav-justified>li {
-    float: none
-}
-.nav-justified>li>a {
-    text-align: center;
-    margin-bottom: 5px
-}
-.nav-justified>.dropdown .dropdown-menu {
-    top: auto;
-    left: auto
-}
-@media (min-width: 768px) {
-    .nav-justified>li {
-        display: table-cell;
-        width: 1%
-    }
-    .nav-justified>li>a {
-        margin-bottom: 0
-    }
-}
-.nav-tabs-justified {
-    border-bottom: 0
-}
-.nav-tabs-justified>li>a {
-    margin-right: 0;
-    border-radius: 0
-}
-.nav-tabs-justified>.active>a,
-.nav-tabs-justified>.active>a:hover,
-.nav-tabs-justified>.active>a:focus {
-    border: 1px solid #dddddd
-}
-@media (min-width: 768px) {
-    .nav-tabs-justified>li>a {
-        border-bottom: 1px solid #dddddd;
-        border-radius: 0 0 0 0
-    }
-    .nav-tabs-justified>.active>a,
-    .nav-tabs-justified>.active>a:hover,
-    .nav-tabs-justified>.active>a:focus {
-        border-bottom-color: #ffffff
-    }
-}
-.tab-content>.tab-pane {
-    display: none;
-    visibility: hidden
-}
-.tab-content>.active {
-    display: block;
-    visibility: visible
-}
-.nav-tabs .dropdown-menu {
-    margin-top: -1px;
-    border-top-right-radius: 0;
-    border-top-left-radius: 0
-}
-.navbar {
-    position: relative;
-    min-height: 45px;
-    margin-bottom: 21px;
-    border: 1px solid transparent
-}
-@media (min-width: 768px) {
-    .navbar {
-        border-radius: 0
-    }
-}
-@media (min-width: 768px) {
-    .navbar-header {
-        float: left
-    }
-}
-.navbar-collapse {
-    overflow-x: visible;
-    padding-right: 15px;
-    padding-left: 15px;
-    border-top: 1px solid transparent;
-    -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1);
-    box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1);
-    -webkit-overflow-scrolling: touch
-}
-.navbar-collapse.in {
-    overflow-y: auto
-}
-@media (min-width: 768px) {
-    .navbar-collapse {
-        width: auto;
-        border-top: 0;
-        -webkit-box-shadow: none;
-        box-shadow: none
-    }
-    .navbar-collapse.collapse {
-        display: block !important;
-        visibility: visible !important;
-        height: auto !important;
-        padding-bottom: 0;
-        overflow: visible !important
-    }
-    .navbar-collapse.in {
-        overflow-y: visible
-    }
-    .navbar-fixed-top .navbar-collapse,
-    .navbar-static-top .navbar-collapse,
-    .navbar-fixed-bottom .navbar-collapse {
-        padding-left: 0;
-        padding-right: 0
-    }
-}
-.navbar-fixed-top .navbar-collapse,
-.navbar-fixed-bottom .navbar-collapse {
-    max-height: 340px
-}
-@media (max-device-width: 480px) and (orientation: landscape) {
-    .navbar-fixed-top .navbar-collapse,
-    .navbar-fixed-bottom .navbar-collapse {
-        max-height: 200px
-    }
-}
-.container>.navbar-header,
-.container-fluid>.navbar-header,
-.container>.navbar-collapse,
-.container-fluid>.navbar-collapse {
-    margin-right: -15px;
-    margin-left: -15px
-}
-@media (min-width: 768px) {
-    .container>.navbar-header,
-    .container-fluid>.navbar-header,
-    .container>.navbar-collapse,
-    .container-fluid>.navbar-collapse {
-        margin-right: 0;
-        margin-left: 0
-    }
-}
-.navbar-static-top {
-    z-index: 1000;
-    border-width: 0 0 1px
-}
-@media (min-width: 768px) {
-    .navbar-static-top {
-        border-radius: 0
-    }
-}
-.navbar-fixed-top,
-.navbar-fixed-bottom {
-    position: fixed;
-    right: 0;
-    left: 0;
-    z-index: 1030
-}
-@media (min-width: 768px) {
-    .navbar-fixed-top,
-    .navbar-fixed-bottom {
-        border-radius: 0
-    }
-}
-.navbar-fixed-top {
-    top: 0;
-    border-width: 0 0 1px
-}
-.navbar-fixed-bottom {
-    bottom: 0;
-    margin-bottom: 0;
-    border-width: 1px 0 0
-}
-.navbar-brand {
-    float: left;
-    padding: 12px 15px;
-    font-size: 19px;
-    line-height: 21px;
-    height: 45px
-}
-.navbar-brand:hover,
-.navbar-brand:focus {
-    text-decoration: none
-}
-.navbar-brand>img {
-    display: block
-}
-@media (min-width: 768px) {
-    .navbar>.container .navbar-brand,
-    .navbar>.container-fluid .navbar-brand {
-        margin-left: -15px
-    }
-}
-.navbar-toggle {
-    position: relative;
-    float: right;
-    margin-right: 15px;
-    padding: 9px 10px;
-    margin-top: 5.5px;
-    margin-bottom: 5.5px;
-    background-color: transparent;
-    background-image: none;
-    border: 1px solid transparent;
-    border-radius: 0
-}
-.navbar-toggle:focus {
-    outline: 0
-}
-.navbar-toggle .icon-bar {
-    display: block;
-    width: 22px;
-    height: 2px;
-    border-radius: 1px
-}
-.navbar-toggle .icon-bar+.icon-bar {
-    margin-top: 4px
-}
-@media (min-width: 768px) {
-    .navbar-toggle {
-        display: none
-    }
-}
-.navbar-nav {
-    margin: 6px -15px
-}
-.navbar-nav>li>a {
-    padding-top: 10px;
-    padding-bottom: 10px;
-    line-height: 21px
-}
-@media (max-width: 767px) {
-    .navbar-nav .open .dropdown-menu {
-        position: static;
-        float: none;
-        width: auto;
-        margin-top: 0;
-        background-color: transparent;
-        border: 0;
-        -webkit-box-shadow: none;
-        box-shadow: none
-    }
-    .navbar-nav .open .dropdown-menu>li>a,
-    .navbar-nav .open .dropdown-menu .dropdown-header {
-        padding: 5px 15px 5px 25px
-    }
-    .navbar-nav .open .dropdown-menu>li>a {
-        line-height: 21px
-    }
-    .navbar-nav .open .dropdown-menu>li>a:hover,
-    .navbar-nav .open .dropdown-menu>li>a:focus {
-        background-image: none
-    }
-}
-@media (min-width: 768px) {
-    .navbar-nav {
-        float: left;
-        margin: 0
-    }
-    .navbar-nav>li {
-        float: left
-    }
-    .navbar-nav>li>a {
-        padding-top: 12px;
-        padding-bottom: 12px
-    }
-}
-.navbar-form {
-    margin-left: -15px;
-    margin-right: -15px;
-    padding: 10px 15px;
-    border-top: 1px solid transparent;
-    border-bottom: 1px solid transparent;
-    -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
-    box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
-    margin-top: 3px;
-    margin-bottom: 3px
-}
-@media (min-width: 768px) {
-    .navbar-form .form-group {
-        display: inline-block;
-        margin-bottom: 0;
-        vertical-align: middle
-    }
-    .navbar-form .form-control {
-        display: inline-block;
-        width: auto;
-        vertical-align: middle
-    }
-    .navbar-form .form-control-static {
-        display: inline-block
-    }
-    .navbar-form .input-group {
-        display: inline-table;
-        vertical-align: middle
-    }
-    .navbar-form .input-group .input-group-addon,
-    .navbar-form .input-group .input-group-btn,
-    .navbar-form .input-group .form-control {
-        width: auto
-    }
-    .navbar-form .input-group>.form-control {
-        width: 100%
-    }
-    .navbar-form .control-label {
-        margin-bottom: 0;
-        vertical-align: middle
-    }
-    .navbar-form .radio,
-    .navbar-form .checkbox {
-        display: inline-block;
-        margin-top: 0;
-        margin-bottom: 0;
-        vertical-align: middle
-    }
-    .navbar-form .radio label,
-    .navbar-form .checkbox label {
-        padding-left: 0
-    }
-    .navbar-form .radio input[type="radio"],
-    .navbar-form .checkbox input[type="checkbox"] {
-        position: relative;
-        margin-left: 0
-    }
-    .navbar-form .has-feedback .form-control-feedback {
-        top: 0
-    }
-}
-@media (max-width: 767px) {
-    .navbar-form .form-group {
-        margin-bottom: 5px
-    }
-    .navbar-form .form-group:last-child {
-        margin-bottom: 0
-    }
-}
-@media (min-width: 768px) {
-    .navbar-form {
-        width: auto;
-        border: 0;
-        margin-left: 0;
-        margin-right: 0;
-        padding-top: 0;
-        padding-bottom: 0;
-        -webkit-box-shadow: none;
-        box-shadow: none
-    }
-}
-.navbar-nav>li>.dropdown-menu {
-    margin-top: 0;
-    border-top-right-radius: 0;
-    border-top-left-radius: 0
-}
-.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu {
-    border-top-right-radius: 0;
-    border-top-left-radius: 0;
-    border-bottom-right-radius: 0;
-    border-bottom-left-radius: 0
-}
-.navbar-btn {
-    margin-top: 3px;
-    margin-bottom: 3px
-}
-.navbar-btn.btn-sm {
-    margin-top: 4.5px;
-    margin-bottom: 4.5px
-}
-.navbar-btn.btn-xs {
-    margin-top: 11.5px;
-    margin-bottom: 11.5px
-}
-.navbar-text {
-    margin-top: 12px;
-    margin-bottom: 12px
-}
-@media (min-width: 768px) {
-    .navbar-text {
-        float: left;
-        margin-left: 15px;
-        margin-right: 15px
-    }
-}
-@media (min-width: 768px) {
-    .navbar-left {
-        float: left !important
-    }
-    .navbar-right {
-        float: right !important;
-        margin-right: -15px
-    }
-    .navbar-right~.navbar-right {
-        margin-right: 0
-    }
-}
-.navbar-default {
-    background-color: #333333;
-    border-color: #222222
-}
-.navbar-default .navbar-brand {
-    color: #ffffff
-}
-.navbar-default .navbar-brand:hover,
-.navbar-default .navbar-brand:focus {
-    color: #ffffff;
-    background-color: transparent
-}
-.navbar-default .navbar-text {
-    color: #ffffff
-}
-.navbar-default .navbar-nav>li>a {
-    color: #ffffff
-}
-.navbar-default .navbar-nav>li>a:hover,
-.navbar-default .navbar-nav>li>a:focus {
-    color: #ffffff;
-    background-color: #272727
-}
-.navbar-default .navbar-nav>.active>a,
-.navbar-default .navbar-nav>.active>a:hover,
-.navbar-default .navbar-nav>.active>a:focus {
-    color: #ffffff;
-    background-color: #272727
-}
-.navbar-default .navbar-nav>.disabled>a,
-.navbar-default .navbar-nav>.disabled>a:hover,
-.navbar-default .navbar-nav>.disabled>a:focus {
-    color: #cccccc;
-    background-color: transparent
-}
-.navbar-default .navbar-toggle {
-    border-color: transparent
-}
-.navbar-default .navbar-toggle:hover,
-.navbar-default .navbar-toggle:focus {
-    background-color: transparent
-}
-.navbar-default .navbar-toggle .icon-bar {
-    background-color: #ffffff
-}
-.navbar-default .navbar-collapse,
-.navbar-default .navbar-form {
-    border-color: #222222
-}
-.navbar-default .navbar-nav>.open>a,
-.navbar-default .navbar-nav>.open>a:hover,
-.navbar-default .navbar-nav>.open>a:focus {
-    background-color: #272727;
-    color: #ffffff
-}
-@media (max-width: 767px) {
-    .navbar-default .navbar-nav .open .dropdown-menu>li>a {
-        color: #ffffff
-    }
-    .navbar-default .navbar-nav .open .dropdown-menu>li>a:hover,
-    .navbar-default .navbar-nav .open .dropdown-menu>li>a:focus {
-        color: #ffffff;
-        background-color: #272727
-    }
-    .navbar-default .navbar-nav .open .dropdown-menu>.active>a,
-    .navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover,
-    .navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus {
-        color: #ffffff;
-        background-color: #272727
-    }
-    .navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,
-    .navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover,
-    .navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus {
-        color: #cccccc;
-        background-color: transparent
-    }
-}
-.navbar-default .navbar-link {
-    color: #ffffff
-}
-.navbar-default .navbar-link:hover {
-    color: #ffffff
-}
-.navbar-default .btn-link {
-    color: #ffffff
-}
-.navbar-default .btn-link:hover,
-.navbar-default .btn-link:focus {
-    color: #ffffff
-}
-.navbar-default .btn-link[disabled]:hover,
-fieldset[disabled] .navbar-default .btn-link:hover,
-.navbar-default .btn-link[disabled]:focus,
-fieldset[disabled] .navbar-default .btn-link:focus {
-    color: #cccccc
-}
-.navbar-inverse {
-    background-color: #008cba;
-    border-color: #006687
-}
-.navbar-inverse .navbar-brand {
-    color: #ffffff
-}
-.navbar-inverse .navbar-brand:hover,
-.navbar-inverse .navbar-brand:focus {
-    color: #ffffff;
-    background-color: transparent
-}
-.navbar-inverse .navbar-text {
-    color: #ffffff
-}
-.navbar-inverse .navbar-nav>li>a {
-    color: #ffffff
-}
-.navbar-inverse .navbar-nav>li>a:hover,
-.navbar-inverse .navbar-nav>li>a:focus {
-    color: #ffffff;
-    background-color: #006687
-}
-.navbar-inverse .navbar-nav>.active>a,
-.navbar-inverse .navbar-nav>.active>a:hover,
-.navbar-inverse .navbar-nav>.active>a:focus {
-    color: #ffffff;
-    background-color: #006687
-}
-.navbar-inverse .navbar-nav>.disabled>a,
-.navbar-inverse .navbar-nav>.disabled>a:hover,
-.navbar-inverse .navbar-nav>.disabled>a:focus {
-    color: #444444;
-    background-color: transparent
-}
-.navbar-inverse .navbar-toggle {
-    border-color: transparent
-}
-.navbar-inverse .navbar-toggle:hover,
-.navbar-inverse .navbar-toggle:focus {
-    background-color: transparent
-}
-.navbar-inverse .navbar-toggle .icon-bar {
-    background-color: #ffffff
-}
-.navbar-inverse .navbar-collapse,
-.navbar-inverse .navbar-form {
-    border-color: #007196
-}
-.navbar-inverse .navbar-nav>.open>a,
-.navbar-inverse .navbar-nav>.open>a:hover,
-.navbar-inverse .navbar-nav>.open>a:focus {
-    background-color: #006687;
-    color: #ffffff
-}
-@media (max-width: 767px) {
-    .navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header {
-        border-color: #006687
-    }
-    .navbar-inverse .navbar-nav .open .dropdown-menu .divider {
-        background-color: #006687
-    }
-    .navbar-inverse .navbar-nav .open .dropdown-menu>li>a {
-        color: #ffffff
-    }
-    .navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover,
-    .navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus {
-        color: #ffffff;
-        background-color: #006687
-    }
-    .navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,
-    .navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover,
-    .navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus {
-        color: #ffffff;
-        background-color: #006687
-    }
-    .navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,
-    .navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover,
-    .navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus {
-        color: #444444;
-        background-color: transparent
-    }
-}
-.navbar-inverse .navbar-link {
-    color: #ffffff
-}
-.navbar-inverse .navbar-link:hover {
-    color: #ffffff
-}
-.navbar-inverse .btn-link {
-    color: #ffffff
-}
-.navbar-inverse .btn-link:hover,
-.navbar-inverse .btn-link:focus {
-    color: #ffffff
-}
-.navbar-inverse .btn-link[disabled]:hover,
-fieldset[disabled] .navbar-inverse .btn-link:hover,
-.navbar-inverse .btn-link[disabled]:focus,
-fieldset[disabled] .navbar-inverse .btn-link:focus {
-    color: #444444
-}
-.breadcrumb {
-    padding: 8px 15px;
-    margin-bottom: 21px;
-    list-style: none;
-    background-color: #f5f5f5;
-    border-radius: 0
-}
-.breadcrumb>li {
-    display: inline-block
-}
-.breadcrumb>li+li:before {
-    content: "/\00a0";
-    padding: 0 5px;
-    color: #999999
-}
-.breadcrumb>.active {
-    color: #333333
-}
-.pagination {
-    display: inline-block;
-    padding-left: 0;
-    margin: 21px 0;
-    border-radius: 0
-}
-.pagination>li {
-    display: inline
-}
-.pagination>li>a,
-.pagination>li>span {
-    position: relative;
-    float: left;
-    padding: 8px 12px;
-    line-height: 1.4;
-    text-decoration: none;
-    color: #008cba;
-    background-color: transparent;
-    border: 1px solid transparent;
-    margin-left: -1px
-}
-.pagination>li:first-child>a,
-.pagination>li:first-child>span {
-    margin-left: 0;
-    border-bottom-left-radius: 0;
-    border-top-left-radius: 0
-}
-.pagination>li:last-child>a,
-.pagination>li:last-child>span {
-    border-bottom-right-radius: 0;
-    border-top-right-radius: 0
-}
-.pagination>li>a:hover,
-.pagination>li>span:hover,
-.pagination>li>a:focus,
-.pagination>li>span:focus {
-    color: #00526e;
-    background-color: #eeeeee;
-    border-color: transparent
-}
-.pagination>.active>a,
-.pagination>.active>span,
-.pagination>.active>a:hover,
-.pagination>.active>span:hover,
-.pagination>.active>a:focus,
-.pagination>.active>span:focus {
-    z-index: 2;
-    color: #ffffff;
-    background-color: #008cba;
-    border-color: transparent;
-    cursor: default
-}
-.pagination>.disabled>span,
-.pagination>.disabled>span:hover,
-.pagination>.disabled>span:focus,
-.pagination>.disabled>a,
-.pagination>.disabled>a:hover,
-.pagination>.disabled>a:focus {
-    color: #999999;
-    background-color: #ffffff;
-    border-color: transparent;
-    cursor: not-allowed
-}
-.pagination-lg>li>a,
-.pagination-lg>li>span {
-    padding: 16px 20px;
-    font-size: 19px
-}
-.pagination-lg>li:first-child>a,
-.pagination-lg>li:first-child>span {
-    border-bottom-left-radius: 0;
-    border-top-left-radius: 0
-}
-.pagination-lg>li:last-child>a,
-.pagination-lg>li:last-child>span {
-    border-bottom-right-radius: 0;
-    border-top-right-radius: 0
-}
-.pagination-sm>li>a,
-.pagination-sm>li>span {
-    padding: 8px 12px;
-    font-size: 12px
-}
-.pagination-sm>li:first-child>a,
-.pagination-sm>li:first-child>span {
-    border-bottom-left-radius: 0;
-    border-top-left-radius: 0
-}
-.pagination-sm>li:last-child>a,
-.pagination-sm>li:last-child>span {
-    border-bottom-right-radius: 0;
-    border-top-right-radius: 0
-}
-.pager {
-    padding-left: 0;
-    margin: 21px 0;
-    list-style: none;
-    text-align: center
-}
-.pager li {
-    display: inline
-}
-.pager li>a,
-.pager li>span {
-    display: inline-block;
-    padding: 5px 14px;
-    background-color: transparent;
-    border: 1px solid transparent;
-    border-radius: 3px
-}
-.pager li>a:hover,
-.pager li>a:focus {
-    text-decoration: none;
-    background-color: #eeeeee
-}
-.pager .next>a,
-.pager .next>span {
-    float: right
-}
-.pager .previous>a,
-.pager .previous>span {
-    float: left
-}
-.pager .disabled>a,
-.pager .disabled>a:hover,
-.pager .disabled>a:focus,
-.pager .disabled>span {
-    color: #999999;
-    background-color: transparent;
-    cursor: not-allowed
-}
-.label {
-    display: inline;
-    padding: .2em .6em .3em;
-    font-size: 75%;
-    font-weight: bold;
-    line-height: 1;
-    color: #ffffff;
-    text-align: center;
-    white-space: nowrap;
-    vertical-align: baseline;
-    border-radius: .25em
-}
-a.label:hover,
-a.label:focus {
-    color: #ffffff;
-    text-decoration: none;
-    cursor: pointer
-}
-.label:empty {
-    display: none
-}
-.btn .label {
-    position: relative;
-    top: -1px
-}
-.label-default {
-    background-color: #999999
-}
-.label-default[href]:hover,
-.label-default[href]:focus {
-    background-color: #808080
-}
-.label-primary {
-    background-color: #008cba
-}
-.label-primary[href]:hover,
-.label-primary[href]:focus {
-    background-color: #006687
-}
-.label-success {
-    background-color: #43ac6a
-}
-.label-success[href]:hover,
-.label-success[href]:focus {
-    background-color: #358753
-}
-.label-info {
-    background-color: #5bc0de
-}
-.label-info[href]:hover,
-.label-info[href]:focus {
-    background-color: #31b0d5
-}
-.label-warning {
-    background-color: #e99002
-}
-.label-warning[href]:hover,
-.label-warning[href]:focus {
-    background-color: #b67102
-}
-.label-danger {
-    background-color: #f04124
-}
-.label-danger[href]:hover,
-.label-danger[href]:focus {
-    background-color: #d32a0e
-}
-.badge {
-    display: inline-block;
-    min-width: 10px;
-    padding: 3px 7px;
-    font-size: 12px;
-    font-weight: bold;
-    color: #ffffff;
-    line-height: 1;
-    vertical-align: baseline;
-    white-space: nowrap;
-    text-align: center;
-    background-color: #008cba;
-    border-radius: 10px
-}
-.badge:empty {
-    display: none
-}
-.btn .badge {
-    position: relative;
-    top: -1px
-}
-.btn-xs .badge {
-    top: 0;
-    padding: 1px 5px
-}
-a.badge:hover,
-a.badge:focus {
-    color: #ffffff;
-    text-decoration: none;
-    cursor: pointer
-}
-.list-group-item.active>.badge,
-.nav-pills>.active>a>.badge {
-    color: #008cba;
-    background-color: #ffffff
-}
-.list-group-item>.badge {
-    float: right
-}
-.list-group-item>.badge+.badge {
-    margin-right: 5px
-}
-.nav-pills>li>a>.badge {
-    margin-left: 3px
-}
-.jumbotron {
-    padding: 30px 15px;
-    margin-bottom: 30px;
-    color: inherit;
-    background-color: #fafafa
-}
-.jumbotron h1,
-.jumbotron .h1 {
-    color: inherit
-}
-.jumbotron p {
-    margin-bottom: 15px;
-    font-size: 23px;
-    font-weight: 200
-}
-.jumbotron>hr {
-    border-top-color: #e1e1e1
-}
-.container .jumbotron,
-.container-fluid .jumbotron {
-    border-radius: 0
-}
-.jumbotron .container {
-    max-width: 100%
-}
-@media screen and (min-width: 768px) {
-    .jumbotron {
-        padding: 48px 0
-    }
-    .container .jumbotron,
-    .container-fluid .jumbotron {
-        padding-left: 60px;
-        padding-right: 60px
-    }
-    .jumbotron h1,
-    .jumbotron .h1 {
-        font-size: 67.5px
-    }
-}
-.thumbnail {
-    display: block;
-    padding: 4px;
-    margin-bottom: 21px;
-    line-height: 1.4;
-    background-color: #ffffff;
-    border: 1px solid #dddddd;
-    border-radius: 0;
-    -webkit-transition: border .2s ease-in-out;
-    -o-transition: border .2s ease-in-out;
-    transition: border .2s ease-in-out
-}
-.thumbnail>img,
-.thumbnail a>img {
-    margin-left: auto;
-    margin-right: auto
-}
-a.thumbnail:hover,
-a.thumbnail:focus,
-a.thumbnail.active {
-    border-color: #008cba
-}
-.thumbnail .caption {
-    padding: 9px;
-    color: #222222
-}
-.alert {
-    padding: 15px;
-    margin-bottom: 21px;
-    border: 1px solid transparent;
-    border-radius: 0
-}
-.alert h4 {
-    margin-top: 0;
-    color: inherit
-}
-.alert .alert-link {
-    font-weight: bold
-}
-.alert>p,
-.alert>ul {
-    margin-bottom: 0
-}
-.alert>p+p {
-    margin-top: 5px
-}
-.alert-dismissable,
-.alert-dismissible {
-    padding-right: 35px
-}
-.alert-dismissable .close,
-.alert-dismissible .close {
-    position: relative;
-    top: -2px;
-    right: -21px;
-    color: inherit
-}
-.alert-success {
-    background-color: #43ac6a;
-    border-color: #3c9a5f;
-    color: #ffffff
-}
-.alert-success hr {
-    border-top-color: #358753
-}
-.alert-success .alert-link {
-    color: #e6e6e6
-}
-.alert-info {
-    background-color: #5bc0de;
-    border-color: #3db5d8;
-    color: #ffffff
-}
-.alert-info hr {
-    border-top-color: #2aabd2
-}
-.alert-info .alert-link {
-    color: #e6e6e6
-}
-.alert-warning {
-    background-color: #e99002;
-    border-color: #d08002;
-    color: #ffffff
-}
-.alert-warning hr {
-    border-top-color: #b67102
-}
-.alert-warning .alert-link {
-    color: #e6e6e6
-}
-.alert-danger {
-    background-color: #f04124;
-    border-color: #ea2f10;
-    color: #ffffff
-}
-.alert-danger hr {
-    border-top-color: #d32a0e
-}
-.alert-danger .alert-link {
-    color: #e6e6e6
-}
-@-webkit-keyframes progress-bar-stripes {
-    from {
-        background-position: 40px 0
-    }
-    to {
-        background-position: 0 0
-    }
-}
-@-o-keyframes progress-bar-stripes {
-    from {
-        background-position: 40px 0
-    }
-    to {
-        background-position: 0 0
-    }
-}
-@keyframes progress-bar-stripes {
-    from {
-        background-position: 40px 0
-    }
-    to {
-        background-position: 0 0
-    }
-}
-.progress {
-    overflow: hidden;
-    height: 21px;
-    margin-bottom: 21px;
-    background-color: #f5f5f5;
-    border-radius: 0;
-    -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-    box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1)
-}
-.progress-bar {
-    float: left;
-    width: 0%;
-    height: 100%;
-    font-size: 12px;
-    line-height: 21px;
-    color: #ffffff;
-    text-align: center;
-    background-color: #008cba;
-    -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-    box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-    -webkit-transition: width 0.6s ease;
-    -o-transition: width 0.6s ease;
-    transition: width 0.6s ease
-}
-.progress-striped .progress-bar,
-.progress-bar-striped {
-    background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-    background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-    background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-    -webkit-background-size: 40px 40px;
-    background-size: 40px 40px
-}
-.progress.active .progress-bar,
-.progress-bar.active {
-    -webkit-animation: progress-bar-stripes 2s linear infinite;
-    -o-animation: progress-bar-stripes 2s linear infinite;
-    animation: progress-bar-stripes 2s linear infinite
-}
-.progress-bar-success {
-    background-color: #43ac6a
-}
-.progress-striped .progress-bar-success {
-    background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-    background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-    background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent)
-}
-.progress-bar-info {
-    background-color: #5bc0de
-}
-.progress-striped .progress-bar-info {
-    background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-    background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-    background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent)
-}
-.progress-bar-warning {
-    background-color: #e99002
-}
-.progress-striped .progress-bar-warning {
-    background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-    background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-    background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent)
-}
-.progress-bar-danger {
-    background-color: #f04124
-}
-.progress-striped .progress-bar-danger {
-    background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-    background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-    background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent)
-}
-.media {
-    margin-top: 15px
-}
-.media:first-child {
-    margin-top: 0
-}
-.media-right,
-.media>.pull-right {
-    padding-left: 10px
-}
-.media-left,
-.media>.pull-left {
-    padding-right: 10px
-}
-.media-left,
-.media-right,
-.media-body {
-    display: table-cell;
-    vertical-align: top
-}
-.media-middle {
-    vertical-align: middle
-}
-.media-bottom {
-    vertical-align: bottom
-}
-.media-heading {
-    margin-top: 0;
-    margin-bottom: 5px
-}
-.media-list {
-    padding-left: 0;
-    list-style: none
-}
-.list-group {
-    margin-bottom: 20px;
-    padding-left: 0
-}
-.list-group-item {
-    position: relative;
-    display: block;
-    padding: 10px 15px;
-    margin-bottom: -1px;
-    background-color: #ffffff;
-    border: 1px solid #dddddd
-}
-.list-group-item:first-child {
-    border-top-right-radius: 0;
-    border-top-left-radius: 0
-}
-.list-group-item:last-child {
-    margin-bottom: 0;
-    border-bottom-right-radius: 0;
-    border-bottom-left-radius: 0
-}
-a.list-group-item {
-    color: #555555
-}
-a.list-group-item .list-group-item-heading {
-    color: #333333
-}
-a.list-group-item:hover,
-a.list-group-item:focus {
-    text-decoration: none;
-    color: #555555;
-    background-color: #f5f5f5
-}
-.list-group-item.disabled,
-.list-group-item.disabled:hover,
-.list-group-item.disabled:focus {
-    background-color: #eeeeee;
-    color: #999999;
-    cursor: not-allowed
-}
-.list-group-item.disabled .list-group-item-heading,
-.list-group-item.disabled:hover .list-group-item-heading,
-.list-group-item.disabled:focus .list-group-item-heading {
-    color: inherit
-}
-.list-group-item.disabled .list-group-item-text,
-.list-group-item.disabled:hover .list-group-item-text,
-.list-group-item.disabled:focus .list-group-item-text {
-    color: #999999
-}
-.list-group-item.active,
-.list-group-item.active:hover,
-.list-group-item.active:focus {
-    z-index: 2;
-    color: #ffffff;
-    background-color: #008cba;
-    border-color: #008cba
-}
-.list-group-item.active .list-group-item-heading,
-.list-group-item.active:hover .list-group-item-heading,
-.list-group-item.active:focus .list-group-item-heading,
-.list-group-item.active .list-group-item-heading>small,
-.list-group-item.active:hover .list-group-item-heading>small,
-.list-group-item.active:focus .list-group-item-heading>small,
-.list-group-item.active .list-group-item-heading>.small,
-.list-group-item.active:hover .list-group-item-heading>.small,
-.list-group-item.active:focus .list-group-item-heading>.small {
-    color: inherit
-}
-.list-group-item.active .list-group-item-text,
-.list-group-item.active:hover .list-group-item-text,
-.list-group-item.active:focus .list-group-item-text {
-    color: #87e1ff
-}
-.list-group-item-success {
-    color: #43ac6a;
-    background-color: #dff0d8
-}
-a.list-group-item-success {
-    color: #43ac6a
-}
-a.list-group-item-success .list-group-item-heading {
-    color: inherit
-}
-a.list-group-item-success:hover,
-a.list-group-item-success:focus {
-    color: #43ac6a;
-    background-color: #d0e9c6
-}
-a.list-group-item-success.active,
-a.list-group-item-success.active:hover,
-a.list-group-item-success.active:focus {
-    color: #fff;
-    background-color: #43ac6a;
-    border-color: #43ac6a
-}
-.list-group-item-info {
-    color: #5bc0de;
-    background-color: #d9edf7
-}
-a.list-group-item-info {
-    color: #5bc0de
-}
-a.list-group-item-info .list-group-item-heading {
-    color: inherit
-}
-a.list-group-item-info:hover,
-a.list-group-item-info:focus {
-    color: #5bc0de;
-    background-color: #c4e3f3
-}
-a.list-group-item-info.active,
-a.list-group-item-info.active:hover,
-a.list-group-item-info.active:focus {
-    color: #fff;
-    background-color: #5bc0de;
-    border-color: #5bc0de
-}
-.list-group-item-warning {
-    color: #e99002;
-    background-color: #fcf8e3
-}
-a.list-group-item-warning {
-    color: #e99002
-}
-a.list-group-item-warning .list-group-item-heading {
-    color: inherit
-}
-a.list-group-item-warning:hover,
-a.list-group-item-warning:focus {
-    color: #e99002;
-    background-color: #faf2cc
-}
-a.list-group-item-warning.active,
-a.list-group-item-warning.active:hover,
-a.list-group-item-warning.active:focus {
-    color: #fff;
-    background-color: #e99002;
-    border-color: #e99002
-}
-.list-group-item-danger {
-    color: #f04124;
-    background-color: #f2dede
-}
-a.list-group-item-danger {
-    color: #f04124
-}
-a.list-group-item-danger .list-group-item-heading {
-    color: inherit
-}
-a.list-group-item-danger:hover,
-a.list-group-item-danger:focus {
-    color: #f04124;
-    background-color: #ebcccc
-}
-a.list-group-item-danger.active,
-a.list-group-item-danger.active:hover,
-a.list-group-item-danger.active:focus {
-    color: #fff;
-    background-color: #f04124;
-    border-color: #f04124
-}
-.list-group-item-heading {
-    margin-top: 0;
-    margin-bottom: 5px
-}
-.list-group-item-text {
-    margin-bottom: 0;
-    line-height: 1.3
-}
-.panel {
-    margin-bottom: 21px;
-    background-color: #ffffff;
-    border: 1px solid transparent;
-    border-radius: 0;
-    -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
-    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05)
-}
-.panel-body {
-    padding: 15px
-}
-.panel-heading {
-    font-style: italic;
-    padding: 10px 15px;
-    border-bottom: 1px solid transparent;
-    border-top-right-radius: -1;
-    border-top-left-radius: -1
-}
-.panel-heading>.dropdown .dropdown-toggle {
-    color: inherit
-}
-.panel-title {
-    margin-top: 0;
-    margin-bottom: 0;
-    font-size: 17px;
-    color: inherit
-}
-.panel-title>a {
-    color: inherit
-}
-.panel-footer {
-    padding: 10px 15px;
-    background-color: #f5f5f5;
-    border-top: 1px solid #dddddd;
-    border-bottom-right-radius: -1;
-    border-bottom-left-radius: -1
-}
-.panel>.list-group,
-.panel>.panel-collapse>.list-group {
-    margin-bottom: 0
-}
-.panel>.list-group .list-group-item,
-.panel>.panel-collapse>.list-group .list-group-item {
-    border-width: 1px 0;
-    border-radius: 0
-}
-.panel>.list-group:first-child .list-group-item:first-child,
-.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child {
-    border-top: 0;
-    border-top-right-radius: -1;
-    border-top-left-radius: -1
-}
-.panel>.list-group:last-child .list-group-item:last-child,
-.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child {
-    border-bottom: 0;
-    border-bottom-right-radius: -1;
-    border-bottom-left-radius: -1
-}
-.panel-heading+.list-group .list-group-item:first-child {
-    border-top-width: 0
-}
-.list-group+.panel-footer {
-    border-top-width: 0
-}
-.panel>.table,
-.panel>.table-responsive>.table,
-.panel>.panel-collapse>.table {
-    margin-bottom: 0
-}
-.panel>.table caption,
-.panel>.table-responsive>.table caption,
-.panel>.panel-collapse>.table caption {
-    padding-left: 15px;
-    padding-right: 15px
-}
-.panel>.table:first-child,
-.panel>.table-responsive:first-child>.table:first-child {
-    border-top-right-radius: -1;
-    border-top-left-radius: -1
-}
-.panel>.table:first-child>thead:first-child>tr:first-child,
-.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,
-.panel>.table:first-child>tbody:first-child>tr:first-child,
-.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child {
-    border-top-left-radius: -1;
-    border-top-right-radius: -1
-}
-.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,
-.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,
-.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,
-.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,
-.panel>.table:first-child>thead:first-child>tr:first-child th:first-child,
-.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,
-.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,
-.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child {
-    border-top-left-radius: -1
-}
-.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,
-.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,
-.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,
-.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,
-.panel>.table:first-child>thead:first-child>tr:first-child th:last-child,
-.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,
-.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,
-.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child {
-    border-top-right-radius: -1
-}
-.panel>.table:last-child,
-.panel>.table-responsive:last-child>.table:last-child {
-    border-bottom-right-radius: -1;
-    border-bottom-left-radius: -1
-}
-.panel>.table:last-child>tbody:last-child>tr:last-child,
-.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,
-.panel>.table:last-child>tfoot:last-child>tr:last-child,
-.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child {
-    border-bottom-left-radius: -1;
-    border-bottom-right-radius: -1
-}
-.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,
-.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,
-.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,
-.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,
-.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,
-.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,
-.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child,
-.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child {
-    border-bottom-left-radius: -1
-}
-.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,
-.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,
-.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,
-.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,
-.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,
-.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,
-.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child,
-.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child {
-    border-bottom-right-radius: -1
-}
-.panel>.panel-body+.table,
-.panel>.panel-body+.table-responsive,
-.panel>.table+.panel-body,
-.panel>.table-responsive+.panel-body {
-    border-top: 1px solid #dddddd
-}
-.panel>.table>tbody:first-child>tr:first-child th,
-.panel>.table>tbody:first-child>tr:first-child td {
-    border-top: 0
-}
-.panel>.table-bordered,
-.panel>.table-responsive>.table-bordered {
-    border: 0
-}
-.panel>.table-bordered>thead>tr>th:first-child,
-.panel>.table-responsive>.table-bordered>thead>tr>th:first-child,
-.panel>.table-bordered>tbody>tr>th:first-child,
-.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,
-.panel>.table-bordered>tfoot>tr>th:first-child,
-.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,
-.panel>.table-bordered>thead>tr>td:first-child,
-.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,
-.panel>.table-bordered>tbody>tr>td:first-child,
-.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,
-.panel>.table-bordered>tfoot>tr>td:first-child,
-.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child {
-    border-left: 0
-}
-.panel>.table-bordered>thead>tr>th:last-child,
-.panel>.table-responsive>.table-bordered>thead>tr>th:last-child,
-.panel>.table-bordered>tbody>tr>th:last-child,
-.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,
-.panel>.table-bordered>tfoot>tr>th:last-child,
-.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,
-.panel>.table-bordered>thead>tr>td:last-child,
-.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,
-.panel>.table-bordered>tbody>tr>td:last-child,
-.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,
-.panel>.table-bordered>tfoot>tr>td:last-child,
-.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child {
-    border-right: 0
-}
-.panel>.table-bordered>thead>tr:first-child>td,
-.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,
-.panel>.table-bordered>tbody>tr:first-child>td,
-.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,
-.panel>.table-bordered>thead>tr:first-child>th,
-.panel>.table-responsive>.table-bordered>thead>tr:first-child>th,
-.panel>.table-bordered>tbody>tr:first-child>th,
-.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th {
-    border-bottom: 0
-}
-.panel>.table-bordered>tbody>tr:last-child>td,
-.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,
-.panel>.table-bordered>tfoot>tr:last-child>td,
-.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,
-.panel>.table-bordered>tbody>tr:last-child>th,
-.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,
-.panel>.table-bordered>tfoot>tr:last-child>th,
-.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th {
-    border-bottom: 0
-}
-.panel>.table-responsive {
-    border: 0;
-    margin-bottom: 0
-}
-.panel-group {
-    margin-bottom: 21px
-}
-.panel-group .panel {
-    margin-bottom: 0;
-    border-radius: 0
-}
-.panel-group .panel+.panel {
-    margin-top: 5px
-}
-.panel-group .panel-heading {
-    border-bottom: 0
-}
-.panel-group .panel-heading+.panel-collapse>.panel-body,
-.panel-group .panel-heading+.panel-collapse>.list-group {
-    border-top: 1px solid #dddddd
-}
-.panel-group .panel-footer {
-    border-top: 0
-}
-.panel-group .panel-footer+.panel-collapse .panel-body {
-    border-bottom: 1px solid #dddddd
-}
-.panel-default {
-    border-color: #dddddd
-}
-.panel-default>.panel-heading {
-    color: #333333;
-    background-color: #f5f5f5;
-    border-color: #dddddd
-}
-.panel-default>.panel-heading+.panel-collapse>.panel-body {
-    border-top-color: #dddddd
-}
-.panel-default>.panel-heading .badge {
-    color: #f5f5f5;
-    background-color: #333333
-}
-.panel-default>.panel-footer+.panel-collapse>.panel-body {
-    border-bottom-color: #dddddd
-}
-.panel-primary {
-    border-color: #008cba
-}
-.panel-primary>.panel-heading {
-    color: #ffffff;
-    background-color: #008cba;
-    border-color: #008cba
-}
-.panel-primary>.panel-heading+.panel-collapse>.panel-body {
-    border-top-color: #008cba
-}
-.panel-primary>.panel-heading .badge {
-    color: #008cba;
-    background-color: #ffffff
-}
-.panel-primary>.panel-footer+.panel-collapse>.panel-body {
-    border-bottom-color: #008cba
-}
-.panel-success {
-    border-color: #3c9a5f
-}
-.panel-success>.panel-heading {
-    color: #ffffff;
-    background-color: #43ac6a;
-    border-color: #3c9a5f
-}
-.panel-success>.panel-heading+.panel-collapse>.panel-body {
-    border-top-color: #3c9a5f
-}
-.panel-success>.panel-heading .badge {
-    color: #43ac6a;
-    background-color: #ffffff
-}
-.panel-success>.panel-footer+.panel-collapse>.panel-body {
-    border-bottom-color: #3c9a5f
-}
-.panel-info {
-    border-color: #3db5d8
-}
-.panel-info>.panel-heading {
-    color: #ffffff;
-    background-color: #5bc0de;
-    border-color: #3db5d8
-}
-.panel-info>.panel-heading+.panel-collapse>.panel-body {
-    border-top-color: #3db5d8
-}
-.panel-info>.panel-heading .badge {
-    color: #5bc0de;
-    background-color: #ffffff
-}
-.panel-info>.panel-footer+.panel-collapse>.panel-body {
-    border-bottom-color: #3db5d8
-}
-.panel-warning {
-    border-color: #d08002
-}
-.panel-warning>.panel-heading {
-    color: #ffffff;
-    background-color: #e99002;
-    border-color: #d08002
-}
-.panel-warning>.panel-heading+.panel-collapse>.panel-body {
-    border-top-color: #d08002
-}
-.panel-warning>.panel-heading .badge {
-    color: #e99002;
-    background-color: #ffffff
-}
-.panel-warning>.panel-footer+.panel-collapse>.panel-body {
-    border-bottom-color: #d08002
-}
-.panel-danger {
-    border-color: #ea2f10
-}
-.panel-danger>.panel-heading {
-    color: #ffffff;
-    background-color: #f04124;
-    border-color: #ea2f10
-}
-.panel-danger>.panel-heading+.panel-collapse>.panel-body {
-    border-top-color: #ea2f10
-}
-.panel-danger>.panel-heading .badge {
-    color: #f04124;
-    background-color: #ffffff
-}
-.panel-danger>.panel-footer+.panel-collapse>.panel-body {
-    border-bottom-color: #ea2f10
-}
-.embed-responsive {
-    position: relative;
-    display: block;
-    height: 0;
-    padding: 0;
-    overflow: hidden
-}
-.embed-responsive .embed-responsive-item,
-.embed-responsive iframe,
-.embed-responsive embed,
-.embed-responsive object,
-.embed-responsive video {
-    position: absolute;
-    top: 0;
-    left: 0;
-    bottom: 0;
-    height: 100%;
-    width: 100%;
-    border: 0
-}
-.embed-responsive.embed-responsive-16by9 {
-    padding-bottom: 56.25%
-}
-.embed-responsive.embed-responsive-4by3 {
-    padding-bottom: 75%
-}
-.well {
-    min-height: 20px;
-    padding: 19px;
-    margin-bottom: 20px;
-    background-color: #fafafa;
-    border: 1px solid #e8e8e8;
-    border-radius: 0;
-    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
-    box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05)
-}
-.well blockquote {
-    border-color: #ddd;
-    border-color: rgba(0, 0, 0, 0.15)
-}
-.well-lg {
-    padding: 24px;
-    border-radius: 0
-}
-.well-sm {
-    padding: 9px;
-    border-radius: 0
-}
-.close {
-    float: right;
-    font-size: 22.5px;
-    font-weight: bold;
-    line-height: 1;
-    color: #ffffff;
-    text-shadow: 0 1px 0 #ffffff;
-    opacity: 0.2;
-    filter: alpha(opacity=20)
-}
-.close:hover,
-.close:focus {
-    color: #ffffff;
-    text-decoration: none;
-    cursor: pointer;
-    opacity: 0.5;
-    filter: alpha(opacity=50)
-}
-button.close {
-    padding: 0;
-    cursor: pointer;
-    background: transparent;
-    border: 0;
-    -webkit-appearance: none
-}
-.modal-open {
-    overflow: hidden
-}
-.modal {
-    display: none;
-    overflow: hidden;
-    position: fixed;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    z-index: 1040;
-    -webkit-overflow-scrolling: touch;
-    outline: 0
-}
-.modal.fade .modal-dialog {
-    -webkit-transform: translate(0, -25%);
-    -ms-transform: translate(0, -25%);
-    -o-transform: translate(0, -25%);
-    transform: translate(0, -25%);
-    -webkit-transition: -webkit-transform .3s ease-out;
-    -o-transition: -o-transform .3s ease-out;
-    transition: transform .3s ease-out
-}
-.modal.in .modal-dialog {
-    -webkit-transform: translate(0, 0);
-    -ms-transform: translate(0, 0);
-    -o-transform: translate(0, 0);
-    transform: translate(0, 0)
-}
-.modal-open .modal {
-    overflow-x: hidden;
-    overflow-y: auto
-}
-.modal-dialog {
-    position: relative;
-    width: auto;
-    margin: 10px
-}
-.modal-content {
-    position: relative;
-    background-color: #ffffff;
-    border: 1px solid #999999;
-    border: 1px solid rgba(0, 0, 0, 0.2);
-    border-radius: 0;
-    -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5);
-    box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5);
-    -webkit-background-clip: padding-box;
-    background-clip: padding-box;
-    outline: 0
-}
-.modal-backdrop {
-    position: absolute;
-    top: 0;
-    right: 0;
-    left: 0;
-    background-color: #000000
-}
-.modal-backdrop.fade {
-    opacity: 0;
-    filter: alpha(opacity=0)
-}
-.modal-backdrop.in {
-    opacity: 0.5;
-    filter: alpha(opacity=50)
-}
-.modal-header {
-    padding: 15px;
-    border-bottom: 1px solid #e5e5e5;
-    min-height: 16.4px
-}
-.modal-header .close {
-    margin-top: -2px
-}
-.modal-title {
-    margin: 0;
-    line-height: 1.4
-}
-.modal-body {
-    position: relative;
-    padding: 20px
-}
-.modal-footer {
-    padding: 20px;
-    text-align: right;
-    border-top: 1px solid #e5e5e5
-}
-.modal-footer .btn+.btn {
-    margin-left: 5px;
-    margin-bottom: 0
-}
-.modal-footer .btn-group .btn+.btn {
-    margin-left: -1px
-}
-.modal-footer .btn-block+.btn-block {
-    margin-left: 0
-}
-.modal-scrollbar-measure {
-    position: absolute;
-    top: -9999px;
-    width: 50px;
-    height: 50px;
-    overflow: scroll
-}
-@media (min-width: 768px) {
-    .modal-dialog {
-        width: 600px;
-        margin: 30px auto
-    }
-    .modal-content {
-        -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
-        box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5)
-    }
-    .modal-sm {
-        width: 300px
-    }
-}
-@media (min-width: 992px) {
-    .modal-lg {
-        width: 900px
-    }
-}
-.tooltip {
-    position: absolute;
-    z-index: 1070;
-    display: block;
-    visibility: visible;
-    font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
-    font-size: 12px;
-    font-weight: normal;
-    line-height: 1.4;
-    opacity: 0;
-    filter: alpha(opacity=0)
-}
-.tooltip.in {
-    opacity: 0.9;
-    filter: alpha(opacity=90)
-}
-.tooltip.top {
-    margin-top: -3px;
-    padding: 5px 0
-}
-.tooltip.right {
-    margin-left: 3px;
-    padding: 0 5px
-}
-.tooltip.bottom {
-    margin-top: 3px;
-    padding: 5px 0
-}
-.tooltip.left {
-    margin-left: -3px;
-    padding: 0 5px
-}
-.tooltip-inner {
-    max-width: 200px;
-    padding: 3px 8px;
-    color: #ffffff;
-    text-align: center;
-    text-decoration: none;
-    background-color: #333333;
-    border-radius: 0
-}
-.tooltip-arrow {
-    position: absolute;
-    width: 0;
-    height: 0;
-    border-color: transparent;
-    border-style: solid
-}
-.tooltip.top .tooltip-arrow {
-    bottom: 0;
-    left: 50%;
-    margin-left: -5px;
-    border-width: 5px 5px 0;
-    border-top-color: #333333
-}
-.tooltip.top-left .tooltip-arrow {
-    bottom: 0;
-    right: 5px;
-    margin-bottom: -5px;
-    border-width: 5px 5px 0;
-    border-top-color: #333333
-}
-.tooltip.top-right .tooltip-arrow {
-    bottom: 0;
-    left: 5px;
-    margin-bottom: -5px;
-    border-width: 5px 5px 0;
-    border-top-color: #333333
-}
-.tooltip.right .tooltip-arrow {
-    top: 50%;
-    left: 0;
-    margin-top: -5px;
-    border-width: 5px 5px 5px 0;
-    border-right-color: #333333
-}
-.tooltip.left .tooltip-arrow {
-    top: 50%;
-    right: 0;
-    margin-top: -5px;
-    border-width: 5px 0 5px 5px;
-    border-left-color: #333333
-}
-.tooltip.bottom .tooltip-arrow {
-    top: 0;
-    left: 50%;
-    margin-left: -5px;
-    border-width: 0 5px 5px;
-    border-bottom-color: #333333
-}
-.tooltip.bottom-left .tooltip-arrow {
-    top: 0;
-    right: 5px;
-    margin-top: -5px;
-    border-width: 0 5px 5px;
-    border-bottom-color: #333333
-}
-.tooltip.bottom-right .tooltip-arrow {
-    top: 0;
-    left: 5px;
-    margin-top: -5px;
-    border-width: 0 5px 5px;
-    border-bottom-color: #333333
-}
-.popover {
-    position: absolute;
-    top: 0;
-    left: 0;
-    z-index: 1060;
-    display: none;
-    max-width: 276px;
-    padding: 1px;
-    font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
-    font-size: 15px;
-    font-weight: normal;
-    line-height: 1.4;
-    text-align: left;
-    background-color: #333333;
-    -webkit-background-clip: padding-box;
-    background-clip: padding-box;
-    border: 1px solid #333333;
-    border: 1px solid transparent;
-    border-radius: 0;
-    -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-    box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-    white-space: normal
-}
-.popover.top {
-    margin-top: -10px
-}
-.popover.right {
-    margin-left: 10px
-}
-.popover.bottom {
-    margin-top: 10px
-}
-.popover.left {
-    margin-left: -10px
-}
-.popover-title {
-    margin: 0;
-    padding: 8px 14px;
-    font-size: 15px;
-    background-color: #333333;
-    border-bottom: 1px solid #262626;
-    border-radius: -1 -1 0 0
-}
-.popover-content {
-    padding: 9px 14px
-}
-.popover>.arrow,
-.popover>.arrow:after {
-    position: absolute;
-    display: block;
-    width: 0;
-    height: 0;
-    border-color: transparent;
-    border-style: solid
-}
-.popover>.arrow {
-    border-width: 11px
-}
-.popover>.arrow:after {
-    border-width: 10px;
-    content: ""
-}
-.popover.top>.arrow {
-    left: 50%;
-    margin-left: -11px;
-    border-bottom-width: 0;
-    border-top-color: #000000;
-    border-top-color: rgba(0, 0, 0, 0.05);
-    bottom: -11px
-}
-.popover.top>.arrow:after {
-    content: " ";
-    bottom: 1px;
-    margin-left: -10px;
-    border-bottom-width: 0;
-    border-top-color: #333333
-}
-.popover.right>.arrow {
-    top: 50%;
-    left: -11px;
-    margin-top: -11px;
-    border-left-width: 0;
-    border-right-color: #000000;
-    border-right-color: rgba(0, 0, 0, 0.05)
-}
-.popover.right>.arrow:after {
-    content: " ";
-    left: 1px;
-    bottom: -10px;
-    border-left-width: 0;
-    border-right-color: #333333
-}
-.popover.bottom>.arrow {
-    left: 50%;
-    margin-left: -11px;
-    border-top-width: 0;
-    border-bottom-color: #000000;
-    border-bottom-color: rgba(0, 0, 0, 0.05);
-    top: -11px
-}
-.popover.bottom>.arrow:after {
-    content: " ";
-    top: 1px;
-    margin-left: -10px;
-    border-top-width: 0;
-    border-bottom-color: #333333
-}
-.popover.left>.arrow {
-    top: 50%;
-    right: -11px;
-    margin-top: -11px;
-    border-right-width: 0;
-    border-left-color: #000000;
-    border-left-color: rgba(0, 0, 0, 0.05)
-}
-.popover.left>.arrow:after {
-    content: " ";
-    right: 1px;
-    border-right-width: 0;
-    border-left-color: #333333;
-    bottom: -10px
-}
-.carousel {
-    position: relative
-}
-.carousel-inner {
-    position: relative;
-    overflow: hidden;
-    width: 100%
-}
-.carousel-inner>.item {
-    display: none;
-    position: relative;
-    -webkit-transition: .6s ease-in-out left;
-    -o-transition: .6s ease-in-out left;
-    transition: .6s ease-in-out left
-}
-.carousel-inner>.item>img,
-.carousel-inner>.item>a>img {
-    line-height: 1
-}
-@media all and (transform-3d),
-(-webkit-transform-3d) {
-    .carousel-inner>.item {
-        -webkit-transition: -webkit-transform .6s ease-in-out;
-        -o-transition: -o-transform .6s ease-in-out;
-        transition: transform .6s ease-in-out;
-        -webkit-backface-visibility: hidden;
-        backface-visibility: hidden;
-        -webkit-perspective: 1000;
-        perspective: 1000
-    }
-    .carousel-inner>.item.next,
-    .carousel-inner>.item.active.right {
-        -webkit-transform: translate3d(100%, 0, 0);
-        transform: translate3d(100%, 0, 0);
-        left: 0
-    }
-    .carousel-inner>.item.prev,
-    .carousel-inner>.item.active.left {
-        -webkit-transform: translate3d(-100%, 0, 0);
-        transform: translate3d(-100%, 0, 0);
-        left: 0
-    }
-    .carousel-inner>.item.next.left,
-    .carousel-inner>.item.prev.right,
-    .carousel-inner>.item.active {
-        -webkit-transform: translate3d(0, 0, 0);
-        transform: translate3d(0, 0, 0);
-        left: 0
-    }
-}
-.carousel-inner>.active,
-.carousel-inner>.next,
-.carousel-inner>.prev {
-    display: block
-}
-.carousel-inner>.active {
-    left: 0
-}
-.carousel-inner>.next,
-.carousel-inner>.prev {
-    position: absolute;
-    top: 0;
-    width: 100%
-}
-.carousel-inner>.next {
-    left: 100%
-}
-.carousel-inner>.prev {
-    left: -100%
-}
-.carousel-inner>.next.left,
-.carousel-inner>.prev.right {
-    left: 0
-}
-.carousel-inner>.active.left {
-    left: -100%
-}
-.carousel-inner>.active.right {
-    left: 100%
-}
-.carousel-control {
-    position: absolute;
-    top: 0;
-    left: 0;
-    bottom: 0;
-    width: 15%;
-    opacity: 0.5;
-    filter: alpha(opacity=50);
-    font-size: 20px;
-    color: #ffffff;
-    text-align: center;
-    text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6)
-}
-.carousel-control.left {
-    background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.5) 0, rgba(0, 0, 0, 0.0001) 100%);
-    background-image: -o-linear-gradient(left, rgba(0, 0, 0, 0.5) 0, rgba(0, 0, 0, 0.0001) 100%);
-    background-image: -webkit-gradient(linear, left top, right top, from(rgba(0, 0, 0, 0.5)), to(rgba(0, 0, 0, 0.0001)));
-    background-image: linear-gradient(to right, rgba(0, 0, 0, 0.5) 0, rgba(0, 0, 0, 0.0001) 100%);
-    background-repeat: repeat-x;
-    filter: progid: DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1)
-}
-.carousel-control.right {
-    left: auto;
-    right: 0;
-    background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.0001) 0, rgba(0, 0, 0, 0.5) 100%);
-    background-image: -o-linear-gradient(left, rgba(0, 0, 0, 0.0001) 0, rgba(0, 0, 0, 0.5) 100%);
-    background-image: -webkit-gradient(linear, left top, right top, from(rgba(0, 0, 0, 0.0001)), to(rgba(0, 0, 0, 0.5)));
-    background-image: linear-gradient(to right, rgba(0, 0, 0, 0.0001) 0, rgba(0, 0, 0, 0.5) 100%);
-    background-repeat: repeat-x;
-    filter: progid: DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1)
-}
-.carousel-control:hover,
-.carousel-control:focus {
-    outline: 0;
-    color: #ffffff;
-    text-decoration: none;
-    opacity: 0.9;
-    filter: alpha(opacity=90)
-}
-.carousel-control .icon-prev,
-.carousel-control .icon-next,
-.carousel-control .glyphicon-chevron-left,
-.carousel-control .glyphicon-chevron-right {
-    position: absolute;
-    top: 50%;
-    z-index: 5;
-    display: inline-block
-}
-.carousel-control .icon-prev,
-.carousel-control .glyphicon-chevron-left {
-    left: 50%;
-    margin-left: -10px
-}
-.carousel-control .icon-next,
-.carousel-control .glyphicon-chevron-right {
-    right: 50%;
-    margin-right: -10px
-}
-.carousel-control .icon-prev,
-.carousel-control .icon-next {
-    width: 20px;
-    height: 20px;
-    margin-top: -10px;
-    font-family: serif
-}
-.carousel-control .icon-prev:before {
-    content: '\2039'
-}
-.carousel-control .icon-next:before {
-    content: '\203a'
-}
-.carousel-indicators {
-    position: absolute;
-    bottom: 10px;
-    left: 50%;
-    z-index: 15;
-    width: 60%;
-    margin-left: -30%;
-    padding-left: 0;
-    list-style: none;
-    text-align: center
-}
-.carousel-indicators li {
-    display: inline-block;
-    width: 10px;
-    height: 10px;
-    margin: 1px;
-    text-indent: -999px;
-    border: 1px solid #ffffff;
-    border-radius: 10px;
-    cursor: pointer;
-    background-color: #000 \9;
-    background-color: rgba(0, 0, 0, 0)
-}
-.carousel-indicators .active {
-    margin: 0;
-    width: 12px;
-    height: 12px;
-    background-color: #ffffff
-}
-.carousel-caption {
-    position: absolute;
-    left: 15%;
-    right: 15%;
-    bottom: 20px;
-    z-index: 10;
-    padding-top: 20px;
-    padding-bottom: 20px;
-    color: #ffffff;
-    text-align: center;
-    text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6)
-}
-.carousel-caption .btn {
-    text-shadow: none
-}
-@media screen and (min-width: 768px) {
-    .carousel-control .glyphicon-chevron-left,
-    .carousel-control .glyphicon-chevron-right,
-    .carousel-control .icon-prev,
-    .carousel-control .icon-next {
-        width: 30px;
-        height: 30px;
-        margin-top: -15px;
-        font-size: 30px
-    }
-    .carousel-control .glyphicon-chevron-left,
-    .carousel-control .icon-prev {
-        margin-left: -15px
-    }
-    .carousel-control .glyphicon-chevron-right,
-    .carousel-control .icon-next {
-        margin-right: -15px
-    }
-    .carousel-caption {
-        left: 20%;
-        right: 20%;
-        padding-bottom: 30px
-    }
-    .carousel-indicators {
-        bottom: 20px
-    }
-}
-.clearfix:before,
-.clearfix:after,
-.dl-horizontal dd:before,
-.dl-horizontal dd:after,
-.container:before,
-.container:after,
-.container-fluid:before,
-.container-fluid:after,
-.row:before,
-.row:after,
-.form-horizontal .form-group:before,
-.form-horizontal .form-group:after,
-.btn-toolbar:before,
-.btn-toolbar:after,
-.btn-group-vertical>.btn-group:before,
-.btn-group-vertical>.btn-group:after,
-.nav:before,
-.nav:after,
-.navbar:before,
-.navbar:after,
-.navbar-header:before,
-.navbar-header:after,
-.navbar-collapse:before,
-.navbar-collapse:after,
-.pager:before,
-.pager:after,
-.panel-body:before,
-.panel-body:after,
-.modal-footer:before,
-.modal-footer:after {
-    content: " ";
-    display: table
-}
-.clearfix:after,
-.dl-horizontal dd:after,
-.container:after,
-.container-fluid:after,
-.row:after,
-.form-horizontal .form-group:after,
-.btn-toolbar:after,
-.btn-group-vertical>.btn-group:after,
-.nav:after,
-.navbar:after,
-.navbar-header:after,
-.navbar-collapse:after,
-.pager:after,
-.panel-body:after,
-.modal-footer:after {
-    clear: both
-}
-.center-block {
-    display: block;
-    margin-left: auto;
-    margin-right: auto
-}
-.pull-right {
-    float: right !important
-}
-.pull-left {
-    float: left !important
-}
-.hide {
-    display: none !important
-}
-.show {
-    display: block !important
-}
-.invisible {
-    visibility: hidden
-}
-.text-hide {
-    font: 0/0 a;
-    color: transparent;
-    text-shadow: none;
-    background-color: transparent;
-    border: 0
-}
-.hidden {
-    display: none !important;
-    visibility: hidden !important
-}
-.affix {
-    position: fixed
-}
-@-ms-viewport {
-    width: device-width
-}
-.visible-xs,
-.visible-sm,
-.visible-md,
-.visible-lg {
-    display: none !important
-}
-.visible-xs-block,
-.visible-xs-inline,
-.visible-xs-inline-block,
-.visible-sm-block,
-.visible-sm-inline,
-.visible-sm-inline-block,
-.visible-md-block,
-.visible-md-inline,
-.visible-md-inline-block,
-.visible-lg-block,
-.visible-lg-inline,
-.visible-lg-inline-block {
-    display: none !important
-}
-@media (max-width: 767px) {
-    .visible-xs {
-        display: block !important
-    }
-    table.visible-xs {
-        display: table
-    }
-    tr.visible-xs {
-        display: table-row !important
-    }
-    th.visible-xs,
-    td.visible-xs {
-        display: table-cell !important
-    }
-}
-@media (max-width: 767px) {
-    .visible-xs-block {
-        display: block !important
-    }
-}
-@media (max-width: 767px) {
-    .visible-xs-inline {
-        display: inline !important
-    }
-}
-@media (max-width: 767px) {
-    .visible-xs-inline-block {
-        display: inline-block !important
-    }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-    .visible-sm {
-        display: block !important
-    }
-    table.visible-sm {
-        display: table
-    }
-    tr.visible-sm {
-        display: table-row !important
-    }
-    th.visible-sm,
-    td.visible-sm {
-        display: table-cell !important
-    }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-    .visible-sm-block {
-        display: block !important
-    }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-    .visible-sm-inline {
-        display: inline !important
-    }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-    .visible-sm-inline-block {
-        display: inline-block !important
-    }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-    .visible-md {
-        display: block !important
-    }
-    table.visible-md {
-        display: table
-    }
-    tr.visible-md {
-        display: table-row !important
-    }
-    th.visible-md,
-    td.visible-md {
-        display: table-cell !important
-    }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-    .visible-md-block {
-        display: block !important
-    }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-    .visible-md-inline {
-        display: inline !important
-    }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-    .visible-md-inline-block {
-        display: inline-block !important
-    }
-}
-@media (min-width: 1200px) {
-    .visible-lg {
-        display: block !important
-    }
-    table.visible-lg {
-        display: table
-    }
-    tr.visible-lg {
-        display: table-row !important
-    }
-    th.visible-lg,
-    td.visible-lg {
-        display: table-cell !important
-    }
-}
-@media (min-width: 1200px) {
-    .visible-lg-block {
-        display: block !important
-    }
-}
-@media (min-width: 1200px) {
-    .visible-lg-inline {
-        display: inline !important
-    }
-}
-@media (min-width: 1200px) {
-    .visible-lg-inline-block {
-        display: inline-block !important
-    }
-}
-@media (max-width: 767px) {
-    .hidden-xs {
-        display: none !important
-    }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-    .hidden-sm {
-        display: none !important
-    }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-    .hidden-md {
-        display: none !important
-    }
-}
-@media (min-width: 1200px) {
-    .hidden-lg {
-        display: none !important
-    }
-}
-.visible-print {
-    display: none !important
-}
-@media print {
-    .visible-print {
-        display: block !important
-    }
-    table.visible-print {
-        display: table
-    }
-    tr.visible-print {
-        display: table-row !important
-    }
-    th.visible-print,
-    td.visible-print {
-        display: table-cell !important
-    }
-}
-.visible-print-block {
-    display: none !important
-}
-@media print {
-    .visible-print-block {
-        display: block !important
-    }
-}
-.visible-print-inline {
-    display: none !important
-}
-@media print {
-    .visible-print-inline {
-        display: inline !important
-    }
-}
-.visible-print-inline-block {
-    display: none !important
-}
-@media print {
-    .visible-print-inline-block {
-        display: inline-block !important
-    }
-}
-@media print {
-    .hidden-print {
-        display: none !important
-    }
-}
-.navbar {
-    border: none;
-    font-size: 13px;
-    font-weight: 300
-}
-.navbar .navbar-toggle:hover .icon-bar {
-    background-color: #b3b3b3
-}
-.navbar-collapse {
-    border-top-color: rgba(0, 0, 0, 0.2);
-    -webkit-box-shadow: none;
-    box-shadow: none
-}
-.navbar .btn {
-    padding-top: 6px;
-    padding-bottom: 6px
-}
-.navbar-form {
-    margin-top: 7px;
-    margin-bottom: 5px
-}
-.navbar-form .form-control {
-    height: auto;
-    padding: 4px 6px
-}
-.navbar .dropdown-menu {
-    border: none
-}
-.navbar .dropdown-menu>li>a,
-.navbar .dropdown-menu>li>a:focus {
-    background-color: transparent;
-    font-size: 13px;
-    font-weight: 300
-}
-.navbar .dropdown-header {
-    color: rgba(255, 255, 255, 0.5)
-}
-.navbar-default .dropdown-menu {
-    background-color: #333333
-}
-.navbar-default .dropdown-menu>li>a,
-.navbar-default .dropdown-menu>li>a:focus {
-    color: #ffffff
-}
-.navbar-default .dropdown-menu>li>a:hover,
-.navbar-default .dropdown-menu>.active>a,
-.navbar-default .dropdown-menu>.active>a:hover {
-    background-color: #272727
-}
-.navbar-inverse .dropdown-menu {
-    background-color: #008cba
-}
-.navbar-inverse .dropdown-menu>li>a,
-.navbar-inverse .dropdown-menu>li>a:focus {
-    color: #ffffff
-}
-.navbar-inverse .dropdown-menu>li>a:hover,
-.navbar-inverse .dropdown-menu>.active>a,
-.navbar-inverse .dropdown-menu>.active>a:hover {
-    background-color: #006687
-}
-.btn {
-    padding: 8px 12px
-}
-.btn-lg {
-    padding: 16px 20px
-}
-.btn-sm {
-    padding: 8px 12px
-}
-.btn-xs {
-    padding: 4px 6px
-}
-.btn-group .btn~.dropdown-toggle {
-    padding-left: 16px;
-    padding-right: 16px
-}
-.btn-group .dropdown-menu {
-    border-top-width: 0
-}
-.btn-group.dropup .dropdown-menu {
-    border-top-width: 1px;
-    border-bottom-width: 0;
-    margin-bottom: 0
-}
-.btn-group .dropdown-toggle.btn-default~.dropdown-menu {
-    background-color: #e7e7e7;
-    border-color: #cccccc
-}
-.btn-group .dropdown-toggle.btn-default~.dropdown-menu>li>a {
-    color: #333333
-}
-.btn-group .dropdown-toggle.btn-default~.dropdown-menu>li>a:hover {
-    background-color: #d3d3d3
-}
-.btn-group .dropdown-toggle.btn-primary~.dropdown-menu {
-    background-color: #008cba;
-    border-color: #0079a1
-}
-.btn-group .dropdown-toggle.btn-primary~.dropdown-menu>li>a {
-    color: #ffffff
-}
-.btn-group .dropdown-toggle.btn-primary~.dropdown-menu>li>a:hover {
-    background-color: #006d91
-}
-.btn-group .dropdown-toggle.btn-success~.dropdown-menu {
-    background-color: #43ac6a;
-    border-color: #3c9a5f
-}
-.btn-group .dropdown-toggle.btn-success~.dropdown-menu>li>a {
-    color: #ffffff
-}
-.btn-group .dropdown-toggle.btn-success~.dropdown-menu>li>a:hover {
-    background-color: #388f58
-}
-.btn-group .dropdown-toggle.btn-info~.dropdown-menu {
-    background-color: #5bc0de;
-    border-color: #46b8da
-}
-.btn-group .dropdown-toggle.btn-info~.dropdown-menu>li>a {
-    color: #ffffff
-}
-.btn-group .dropdown-toggle.btn-info~.dropdown-menu>li>a:hover {
-    background-color: #39b3d7
-}
-.btn-group .dropdown-toggle.btn-warning~.dropdown-menu {
-    background-color: #e99002;
-    border-color: #d08002
-}
-.btn-group .dropdown-toggle.btn-warning~.dropdown-menu>li>a {
-    color: #ffffff
-}
-.btn-group .dropdown-toggle.btn-warning~.dropdown-menu>li>a:hover {
-    background-color: #c17702
-}
-.btn-group .dropdown-toggle.btn-danger~.dropdown-menu {
-    background-color: #f04124;
-    border-color: #ea2f10
-}
-.btn-group .dropdown-toggle.btn-danger~.dropdown-menu>li>a {
-    color: #ffffff
-}
-.btn-group .dropdown-toggle.btn-danger~.dropdown-menu>li>a:hover {
-    background-color: #dc2c0f
-}
-.lead {
-    color: #6f6f6f
-}
-cite {
-    font-style: italic
-}
-blockquote {
-    border-left-width: 1px;
-    color: #6f6f6f
-}
-blockquote.pull-right {
-    border-right-width: 1px
-}
-blockquote small {
-    font-size: 12px;
-    font-weight: 300
-}
-table {
-    font-size: 14px
-}
-label,
-.control-label,
-.help-block,
-.checkbox,
-.radio {
-    font-size: 12px;
-    font-weight: normal
-}
-input[type="radio"],
-input[type="checkbox"] {
-    margin-top: 1px
-}
-.nav .open>a,
-.nav .open>a:hover,
-.nav .open>a:focus {
-    border-color: transparent
-}
-.nav-tabs>li>a {
-    background-color: #e7e7e7;
-    color: #222222
-}
-.nav-tabs .caret {
-    border-top-color: #222222;
-    border-bottom-color: #222222
-}
-.nav-pills {
-    font-weight: 300
-}
-.breadcrumb {
-    border: 1px solid #dddddd;
-    border-radius: 3px;
-    font-size: 10px;
-    font-weight: 300;
-    text-transform: uppercase
-}
-.pagination {
-    font-size: 12px;
-    font-weight: 300;
-    color: #999999
-}
-.pagination>li>a,
-.pagination>li>span {
-    margin-left: 4px;
-    color: #999999
-}
-.pagination>.active>a,
-.pagination>.active>span {
-    color: #fff
-}
-.pagination>li>a,
-.pagination>li:first-child>a,
-.pagination>li:last-child>a,
-.pagination>li>span,
-.pagination>li:first-child>span,
-.pagination>li:last-child>span {
-    border-radius: 3px
-}
-.pagination-lg>li>a {
-    padding-left: 22px;
-    padding-right: 22px
-}
-.pagination-sm>li>a {
-    padding: 0 5px
-}
-.pager {
-    font-size: 12px;
-    font-weight: 300;
-    color: #999999
-}
-.list-group {
-    font-size: 12px;
-    font-weight: 300
-}
-.close {
-    opacity: 0.4;
-    text-decoration: none;
-    text-shadow: none
-}
-.close:hover,
-.close:focus {
-    opacity: 1
-}
-.alert {
-    font-size: 12px;
-    font-weight: 300
-}
-.alert .alert-link {
-    font-weight: normal;
-    color: #fff;
-    text-decoration: underline
-}
-.label {
-    padding-left: 1em;
-    padding-right: 1em;
-    border-radius: 0;
-    font-weight: 300
-}
-.label-default {
-    background-color: #e7e7e7;
-    color: #333333
-}
-.badge {
-    font-weight: 300
-}
-.progress {
-    height: 22px;
-    padding: 2px;
-    background-color: #f6f6f6;
-    border: 1px solid #ccc;
-    -webkit-box-shadow: none;
-    box-shadow: none
-}
-.dropdown-menu {
-    padding: 0;
-    margin-top: 0;
-    font-size: 12px
-}
-.dropdown-menu>li>a {
-    padding: 12px 15px
-}
-.dropdown-header {
-    padding-left: 15px;
-    padding-right: 15px;
-    font-size: 9px;
-    text-transform: uppercase
-}
-.popover {
-    color: #fff;
-    font-size: 12px;
-    font-weight: 300
-}
-.panel-heading,
-.panel-footer {
-    border-top-right-radius: 0;
-    border-top-left-radius: 0
-}
-.panel-default .close {
-    color: #222222
-}
-.modal .close {
-    color: #222222
-}
\ No newline at end of file
diff --git a/Doxygen/bootstrap.min.js b/Doxygen/bootstrap.min.js
deleted file mode 100755
index 077bab09..00000000
--- a/Doxygen/bootstrap.min.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/*!
- * Bootstrap v3.3.0 (http://getbootstrap.com)
- * Copyright 2011-2014 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */
-
-/*!
- * Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=99cbec5d77c22890a95b)
- * Config saved to config.json and https://gist.github.com/99cbec5d77c22890a95b
- */
-if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(t){var e=t.fn.jquery.split(" ")[0].split(".");if(e[0]<2&&e[1]<9||1==e[0]&&9==e[1]&&e[2]<1)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher")}(jQuery),+function(t){"use strict";function e(e){return this.each(function(){var i=t(this),s=i.data("bs.alert");s||i.data("bs.alert",s=new o(this)),"string"==typeof e&&s[e].call(i)})}var i='[data-dismiss="alert"]',o=function(e){t(e).on("click",i,this.close)};o.VERSION="3.3.0",o.TRANSITION_DURATION=150,o.prototype.close=function(e){function i(){r.detach().trigger("closed.bs.alert").remove()}var s=t(this),n=s.attr("data-target");n||(n=s.attr("href"),n=n&&n.replace(/.*(?=#[^\s]*$)/,""));var r=t(n);e&&e.preventDefault(),r.length||(r=s.closest(".alert")),r.trigger(e=t.Event("close.bs.alert")),e.isDefaultPrevented()||(r.removeClass("in"),t.support.transition&&r.hasClass("fade")?r.one("bsTransitionEnd",i).emulateTransitionEnd(o.TRANSITION_DURATION):i())};var s=t.fn.alert;t.fn.alert=e,t.fn.alert.Constructor=o,t.fn.alert.noConflict=function(){return t.fn.alert=s,this},t(document).on("click.bs.alert.data-api",i,o.prototype.close)}(jQuery),+function(t){"use strict";function e(e){return this.each(function(){var o=t(this),s=o.data("bs.button"),n="object"==typeof e&&e;s||o.data("bs.button",s=new i(this,n)),"toggle"==e?s.toggle():e&&s.setState(e)})}var i=function(e,o){this.$element=t(e),this.options=t.extend({},i.DEFAULTS,o),this.isLoading=!1};i.VERSION="3.3.0",i.DEFAULTS={loadingText:"loading..."},i.prototype.setState=function(e){var i="disabled",o=this.$element,s=o.is("input")?"val":"html",n=o.data();e+="Text",null==n.resetText&&o.data("resetText",o[s]()),setTimeout(t.proxy(function(){o[s](null==n[e]?this.options[e]:n[e]),"loadingText"==e?(this.isLoading=!0,o.addClass(i).attr(i,i)):this.isLoading&&(this.isLoading=!1,o.removeClass(i).removeAttr(i))},this),0)},i.prototype.toggle=function(){var t=!0,e=this.$element.closest('[data-toggle="buttons"]');if(e.length){var i=this.$element.find("input");"radio"==i.prop("type")&&(i.prop("checked")&&this.$element.hasClass("active")?t=!1:e.find(".active").removeClass("active")),t&&i.prop("checked",!this.$element.hasClass("active")).trigger("change")}else this.$element.attr("aria-pressed",!this.$element.hasClass("active"));t&&this.$element.toggleClass("active")};var o=t.fn.button;t.fn.button=e,t.fn.button.Constructor=i,t.fn.button.noConflict=function(){return t.fn.button=o,this},t(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(i){var o=t(i.target);o.hasClass("btn")||(o=o.closest(".btn")),e.call(o,"toggle"),i.preventDefault()}).on("focus.bs.button.data-api blur.bs.button.data-api",'[data-toggle^="button"]',function(e){t(e.target).closest(".btn").toggleClass("focus","focus"==e.type)})}(jQuery),+function(t){"use strict";function e(e){return this.each(function(){var o=t(this),s=o.data("bs.carousel"),n=t.extend({},i.DEFAULTS,o.data(),"object"==typeof e&&e),r="string"==typeof e?e:n.slide;s||o.data("bs.carousel",s=new i(this,n)),"number"==typeof e?s.to(e):r?s[r]():n.interval&&s.pause().cycle()})}var i=function(e,i){this.$element=t(e),this.$indicators=this.$element.find(".carousel-indicators"),this.options=i,this.paused=this.sliding=this.interval=this.$active=this.$items=null,this.options.keyboard&&this.$element.on("keydown.bs.carousel",t.proxy(this.keydown,this)),"hover"==this.options.pause&&!("ontouchstart"in document.documentElement)&&this.$element.on("mouseenter.bs.carousel",t.proxy(this.pause,this)).on("mouseleave.bs.carousel",t.proxy(this.cycle,this))};i.VERSION="3.3.0",i.TRANSITION_DURATION=600,i.DEFAULTS={interval:5e3,pause:"hover",wrap:!0,keyboard:!0},i.prototype.keydown=function(t){switch(t.which){case 37:this.prev();break;case 39:this.next();break;default:return}t.preventDefault()},i.prototype.cycle=function(e){return e||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(t.proxy(this.next,this),this.options.interval)),this},i.prototype.getItemIndex=function(t){return this.$items=t.parent().children(".item"),this.$items.index(t||this.$active)},i.prototype.getItemForDirection=function(t,e){var i="prev"==t?-1:1,o=this.getItemIndex(e),s=(o+i)%this.$items.length;return this.$items.eq(s)},i.prototype.to=function(t){var e=this,i=this.getItemIndex(this.$active=this.$element.find(".item.active"));return t>this.$items.length-1||0>t?void 0:this.sliding?this.$element.one("slid.bs.carousel",function(){e.to(t)}):i==t?this.pause().cycle():this.slide(t>i?"next":"prev",this.$items.eq(t))},i.prototype.pause=function(e){return e||(this.paused=!0),this.$element.find(".next, .prev").length&&t.support.transition&&(this.$element.trigger(t.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},i.prototype.next=function(){return this.sliding?void 0:this.slide("next")},i.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},i.prototype.slide=function(e,o){var s=this.$element.find(".item.active"),n=o||this.getItemForDirection(e,s),r=this.interval,a="next"==e?"left":"right",l="next"==e?"first":"last",h=this;if(!n.length){if(!this.options.wrap)return;n=this.$element.find(".item")[l]()}if(n.hasClass("active"))return this.sliding=!1;var d=n[0],p=t.Event("slide.bs.carousel",{relatedTarget:d,direction:a});if(this.$element.trigger(p),!p.isDefaultPrevented()){if(this.sliding=!0,r&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active");var c=t(this.$indicators.children()[this.getItemIndex(n)]);c&&c.addClass("active")}var f=t.Event("slid.bs.carousel",{relatedTarget:d,direction:a});return t.support.transition&&this.$element.hasClass("slide")?(n.addClass(e),n[0].offsetWidth,s.addClass(a),n.addClass(a),s.one("bsTransitionEnd",function(){n.removeClass([e,a].join(" ")).addClass("active"),s.removeClass(["active",a].join(" ")),h.sliding=!1,setTimeout(function(){h.$element.trigger(f)},0)}).emulateTransitionEnd(i.TRANSITION_DURATION)):(s.removeClass("active"),n.addClass("active"),this.sliding=!1,this.$element.trigger(f)),r&&this.cycle(),this}};var o=t.fn.carousel;t.fn.carousel=e,t.fn.carousel.Constructor=i,t.fn.carousel.noConflict=function(){return t.fn.carousel=o,this};var s=function(i){var o,s=t(this),n=t(s.attr("data-target")||(o=s.attr("href"))&&o.replace(/.*(?=#[^\s]+$)/,""));if(n.hasClass("carousel")){var r=t.extend({},n.data(),s.data()),a=s.attr("data-slide-to");a&&(r.interval=!1),e.call(n,r),a&&n.data("bs.carousel").to(a),i.preventDefault()}};t(document).on("click.bs.carousel.data-api","[data-slide]",s).on("click.bs.carousel.data-api","[data-slide-to]",s),t(window).on("load",function(){t('[data-ride="carousel"]').each(function(){var i=t(this);e.call(i,i.data())})})}(jQuery),+function(t){"use strict";function e(e){e&&3===e.which||(t(s).remove(),t(n).each(function(){var o=t(this),s=i(o),n={relatedTarget:this};s.hasClass("open")&&(s.trigger(e=t.Event("hide.bs.dropdown",n)),e.isDefaultPrevented()||(o.attr("aria-expanded","false"),s.removeClass("open").trigger("hidden.bs.dropdown",n)))}))}function i(e){var i=e.attr("data-target");i||(i=e.attr("href"),i=i&&/#[A-Za-z]/.test(i)&&i.replace(/.*(?=#[^\s]*$)/,""));var o=i&&t(i);return o&&o.length?o:e.parent()}function o(e){return this.each(function(){var i=t(this),o=i.data("bs.dropdown");o||i.data("bs.dropdown",o=new r(this)),"string"==typeof e&&o[e].call(i)})}var s=".dropdown-backdrop",n='[data-toggle="dropdown"]',r=function(e){t(e).on("click.bs.dropdown",this.toggle)};r.VERSION="3.3.0",r.prototype.toggle=function(o){var s=t(this);if(!s.is(".disabled, :disabled")){var n=i(s),r=n.hasClass("open");if(e(),!r){"ontouchstart"in document.documentElement&&!n.closest(".navbar-nav").length&&t('<div class="dropdown-backdrop"/>').insertAfter(t(this)).on("click",e);var a={relatedTarget:this};if(n.trigger(o=t.Event("show.bs.dropdown",a)),o.isDefaultPrevented())return;s.trigger("focus").attr("aria-expanded","true"),n.toggleClass("open").trigger("shown.bs.dropdown",a)}return!1}},r.prototype.keydown=function(e){if(/(38|40|27|32)/.test(e.which)){var o=t(this);if(e.preventDefault(),e.stopPropagation(),!o.is(".disabled, :disabled")){var s=i(o),r=s.hasClass("open");if(!r&&27!=e.which||r&&27==e.which)return 27==e.which&&s.find(n).trigger("focus"),o.trigger("click");var a=" li:not(.divider):visible a",l=s.find('[role="menu"]'+a+', [role="listbox"]'+a);if(l.length){var h=l.index(e.target);38==e.which&&h>0&&h--,40==e.which&&h<l.length-1&&h++,~h||(h=0),l.eq(h).trigger("focus")}}}};var a=t.fn.dropdown;t.fn.dropdown=o,t.fn.dropdown.Constructor=r,t.fn.dropdown.noConflict=function(){return t.fn.dropdown=a,this},t(document).on("click.bs.dropdown.data-api",e).on("click.bs.dropdown.data-api",".dropdown form",function(t){t.stopPropagation()}).on("click.bs.dropdown.data-api",n,r.prototype.toggle).on("keydown.bs.dropdown.data-api",n,r.prototype.keydown).on("keydown.bs.dropdown.data-api",'[role="menu"]',r.prototype.keydown).on("keydown.bs.dropdown.data-api",'[role="listbox"]',r.prototype.keydown)}(jQuery),+function(t){"use strict";function e(e,o){return this.each(function(){var s=t(this),n=s.data("bs.modal"),r=t.extend({},i.DEFAULTS,s.data(),"object"==typeof e&&e);n||s.data("bs.modal",n=new i(this,r)),"string"==typeof e?n[e](o):r.show&&n.show(o)})}var i=function(e,i){this.options=i,this.$body=t(document.body),this.$element=t(e),this.$backdrop=this.isShown=null,this.scrollbarWidth=0,this.options.remote&&this.$element.find(".modal-content").load(this.options.remote,t.proxy(function(){this.$element.trigger("loaded.bs.modal")},this))};i.VERSION="3.3.0",i.TRANSITION_DURATION=300,i.BACKDROP_TRANSITION_DURATION=150,i.DEFAULTS={backdrop:!0,keyboard:!0,show:!0},i.prototype.toggle=function(t){return this.isShown?this.hide():this.show(t)},i.prototype.show=function(e){var o=this,s=t.Event("show.bs.modal",{relatedTarget:e});this.$element.trigger(s),this.isShown||s.isDefaultPrevented()||(this.isShown=!0,this.checkScrollbar(),this.$body.addClass("modal-open"),this.setScrollbar(),this.escape(),this.$element.on("click.dismiss.bs.modal",'[data-dismiss="modal"]',t.proxy(this.hide,this)),this.backdrop(function(){var s=t.support.transition&&o.$element.hasClass("fade");o.$element.parent().length||o.$element.appendTo(o.$body),o.$element.show().scrollTop(0),s&&o.$element[0].offsetWidth,o.$element.addClass("in").attr("aria-hidden",!1),o.enforceFocus();var n=t.Event("shown.bs.modal",{relatedTarget:e});s?o.$element.find(".modal-dialog").one("bsTransitionEnd",function(){o.$element.trigger("focus").trigger(n)}).emulateTransitionEnd(i.TRANSITION_DURATION):o.$element.trigger("focus").trigger(n)}))},i.prototype.hide=function(e){e&&e.preventDefault(),e=t.Event("hide.bs.modal"),this.$element.trigger(e),this.isShown&&!e.isDefaultPrevented()&&(this.isShown=!1,this.escape(),t(document).off("focusin.bs.modal"),this.$element.removeClass("in").attr("aria-hidden",!0).off("click.dismiss.bs.modal"),t.support.transition&&this.$element.hasClass("fade")?this.$element.one("bsTransitionEnd",t.proxy(this.hideModal,this)).emulateTransitionEnd(i.TRANSITION_DURATION):this.hideModal())},i.prototype.enforceFocus=function(){t(document).off("focusin.bs.modal").on("focusin.bs.modal",t.proxy(function(t){this.$element[0]===t.target||this.$element.has(t.target).length||this.$element.trigger("focus")},this))},i.prototype.escape=function(){this.isShown&&this.options.keyboard?this.$element.on("keydown.dismiss.bs.modal",t.proxy(function(t){27==t.which&&this.hide()},this)):this.isShown||this.$element.off("keydown.dismiss.bs.modal")},i.prototype.hideModal=function(){var t=this;this.$element.hide(),this.backdrop(function(){t.$body.removeClass("modal-open"),t.resetScrollbar(),t.$element.trigger("hidden.bs.modal")})},i.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},i.prototype.backdrop=function(e){var o=this,s=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var n=t.support.transition&&s;if(this.$backdrop=t('<div class="modal-backdrop '+s+'" />').prependTo(this.$element).on("click.dismiss.bs.modal",t.proxy(function(t){t.target===t.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus.call(this.$element[0]):this.hide.call(this))},this)),n&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!e)return;n?this.$backdrop.one("bsTransitionEnd",e).emulateTransitionEnd(i.BACKDROP_TRANSITION_DURATION):e()}else if(!this.isShown&&this.$backdrop){this.$backdrop.removeClass("in");var r=function(){o.removeBackdrop(),e&&e()};t.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one("bsTransitionEnd",r).emulateTransitionEnd(i.BACKDROP_TRANSITION_DURATION):r()}else e&&e()},i.prototype.checkScrollbar=function(){this.scrollbarWidth=this.measureScrollbar()},i.prototype.setScrollbar=function(){var t=parseInt(this.$body.css("padding-right")||0,10);this.scrollbarWidth&&this.$body.css("padding-right",t+this.scrollbarWidth)},i.prototype.resetScrollbar=function(){this.$body.css("padding-right","")},i.prototype.measureScrollbar=function(){if(document.body.clientWidth>=window.innerWidth)return 0;var t=document.createElement("div");t.className="modal-scrollbar-measure",this.$body.append(t);var e=t.offsetWidth-t.clientWidth;return this.$body[0].removeChild(t),e};var o=t.fn.modal;t.fn.modal=e,t.fn.modal.Constructor=i,t.fn.modal.noConflict=function(){return t.fn.modal=o,this},t(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(i){var o=t(this),s=o.attr("href"),n=t(o.attr("data-target")||s&&s.replace(/.*(?=#[^\s]+$)/,"")),r=n.data("bs.modal")?"toggle":t.extend({remote:!/#/.test(s)&&s},n.data(),o.data());o.is("a")&&i.preventDefault(),n.one("show.bs.modal",function(t){t.isDefaultPrevented()||n.one("hidden.bs.modal",function(){o.is(":visible")&&o.trigger("focus")})}),e.call(n,r,this)})}(jQuery),+function(t){"use strict";function e(e){return this.each(function(){var o=t(this),s=o.data("bs.tooltip"),n="object"==typeof e&&e,r=n&&n.selector;(s||"destroy"!=e)&&(r?(s||o.data("bs.tooltip",s={}),s[r]||(s[r]=new i(this,n))):s||o.data("bs.tooltip",s=new i(this,n)),"string"==typeof e&&s[e]())})}var i=function(t,e){this.type=this.options=this.enabled=this.timeout=this.hoverState=this.$element=null,this.init("tooltip",t,e)};i.VERSION="3.3.0",i.TRANSITION_DURATION=150,i.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0}},i.prototype.init=function(e,i,o){this.enabled=!0,this.type=e,this.$element=t(i),this.options=this.getOptions(o),this.$viewport=this.options.viewport&&t(this.options.viewport.selector||this.options.viewport);for(var s=this.options.trigger.split(" "),n=s.length;n--;){var r=s[n];if("click"==r)this.$element.on("click."+this.type,this.options.selector,t.proxy(this.toggle,this));else if("manual"!=r){var a="hover"==r?"mouseenter":"focusin",l="hover"==r?"mouseleave":"focusout";this.$element.on(a+"."+this.type,this.options.selector,t.proxy(this.enter,this)),this.$element.on(l+"."+this.type,this.options.selector,t.proxy(this.leave,this))}}this.options.selector?this._options=t.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},i.prototype.getDefaults=function(){return i.DEFAULTS},i.prototype.getOptions=function(e){return e=t.extend({},this.getDefaults(),this.$element.data(),e),e.delay&&"number"==typeof e.delay&&(e.delay={show:e.delay,hide:e.delay}),e},i.prototype.getDelegateOptions=function(){var e={},i=this.getDefaults();return this._options&&t.each(this._options,function(t,o){i[t]!=o&&(e[t]=o)}),e},i.prototype.enter=function(e){var i=e instanceof this.constructor?e:t(e.currentTarget).data("bs."+this.type);return i&&i.$tip&&i.$tip.is(":visible")?void(i.hoverState="in"):(i||(i=new this.constructor(e.currentTarget,this.getDelegateOptions()),t(e.currentTarget).data("bs."+this.type,i)),clearTimeout(i.timeout),i.hoverState="in",i.options.delay&&i.options.delay.show?void(i.timeout=setTimeout(function(){"in"==i.hoverState&&i.show()},i.options.delay.show)):i.show())},i.prototype.leave=function(e){var i=e instanceof this.constructor?e:t(e.currentTarget).data("bs."+this.type);return i||(i=new this.constructor(e.currentTarget,this.getDelegateOptions()),t(e.currentTarget).data("bs."+this.type,i)),clearTimeout(i.timeout),i.hoverState="out",i.options.delay&&i.options.delay.hide?void(i.timeout=setTimeout(function(){"out"==i.hoverState&&i.hide()},i.options.delay.hide)):i.hide()},i.prototype.show=function(){var e=t.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(e);var o=t.contains(this.$element[0].ownerDocument.documentElement,this.$element[0]);if(e.isDefaultPrevented()||!o)return;var s=this,n=this.tip(),r=this.getUID(this.type);this.setContent(),n.attr("id",r),this.$element.attr("aria-describedby",r),this.options.animation&&n.addClass("fade");var a="function"==typeof this.options.placement?this.options.placement.call(this,n[0],this.$element[0]):this.options.placement,l=/\s?auto?\s?/i,h=l.test(a);h&&(a=a.replace(l,"")||"top"),n.detach().css({top:0,left:0,display:"block"}).addClass(a).data("bs."+this.type,this),this.options.container?n.appendTo(this.options.container):n.insertAfter(this.$element);var d=this.getPosition(),p=n[0].offsetWidth,c=n[0].offsetHeight;if(h){var f=a,u=this.options.container?t(this.options.container):this.$element.parent(),g=this.getPosition(u);a="bottom"==a&&d.bottom+c>g.bottom?"top":"top"==a&&d.top-c<g.top?"bottom":"right"==a&&d.right+p>g.width?"left":"left"==a&&d.left-p<g.left?"right":a,n.removeClass(f).addClass(a)}var v=this.getCalculatedOffset(a,d,p,c);this.applyPlacement(v,a);var m=function(){var t=s.hoverState;s.$element.trigger("shown.bs."+s.type),s.hoverState=null,"out"==t&&s.leave(s)};t.support.transition&&this.$tip.hasClass("fade")?n.one("bsTransitionEnd",m).emulateTransitionEnd(i.TRANSITION_DURATION):m()}},i.prototype.applyPlacement=function(e,i){var o=this.tip(),s=o[0].offsetWidth,n=o[0].offsetHeight,r=parseInt(o.css("margin-top"),10),a=parseInt(o.css("margin-left"),10);isNaN(r)&&(r=0),isNaN(a)&&(a=0),e.top=e.top+r,e.left=e.left+a,t.offset.setOffset(o[0],t.extend({using:function(t){o.css({top:Math.round(t.top),left:Math.round(t.left)})}},e),0),o.addClass("in");var l=o[0].offsetWidth,h=o[0].offsetHeight;"top"==i&&h!=n&&(e.top=e.top+n-h);var d=this.getViewportAdjustedDelta(i,e,l,h);d.left?e.left+=d.left:e.top+=d.top;var p=/top|bottom/.test(i),c=p?2*d.left-s+l:2*d.top-n+h,f=p?"offsetWidth":"offsetHeight";o.offset(e),this.replaceArrow(c,o[0][f],p)},i.prototype.replaceArrow=function(t,e,i){this.arrow().css(i?"left":"top",50*(1-t/e)+"%").css(i?"top":"left","")},i.prototype.setContent=function(){var t=this.tip(),e=this.getTitle();t.find(".tooltip-inner")[this.options.html?"html":"text"](e),t.removeClass("fade in top bottom left right")},i.prototype.hide=function(e){function o(){"in"!=s.hoverState&&n.detach(),s.$element.removeAttr("aria-describedby").trigger("hidden.bs."+s.type),e&&e()}var s=this,n=this.tip(),r=t.Event("hide.bs."+this.type);return this.$element.trigger(r),r.isDefaultPrevented()?void 0:(n.removeClass("in"),t.support.transition&&this.$tip.hasClass("fade")?n.one("bsTransitionEnd",o).emulateTransitionEnd(i.TRANSITION_DURATION):o(),this.hoverState=null,this)},i.prototype.fixTitle=function(){var t=this.$element;(t.attr("title")||"string"!=typeof t.attr("data-original-title"))&&t.attr("data-original-title",t.attr("title")||"").attr("title","")},i.prototype.hasContent=function(){return this.getTitle()},i.prototype.getPosition=function(e){e=e||this.$element;var i=e[0],o="BODY"==i.tagName,s=i.getBoundingClientRect();null==s.width&&(s=t.extend({},s,{width:s.right-s.left,height:s.bottom-s.top}));var n=o?{top:0,left:0}:e.offset(),r={scroll:o?document.documentElement.scrollTop||document.body.scrollTop:e.scrollTop()},a=o?{width:t(window).width(),height:t(window).height()}:null;return t.extend({},s,r,a,n)},i.prototype.getCalculatedOffset=function(t,e,i,o){return"bottom"==t?{top:e.top+e.height,left:e.left+e.width/2-i/2}:"top"==t?{top:e.top-o,left:e.left+e.width/2-i/2}:"left"==t?{top:e.top+e.height/2-o/2,left:e.left-i}:{top:e.top+e.height/2-o/2,left:e.left+e.width}},i.prototype.getViewportAdjustedDelta=function(t,e,i,o){var s={top:0,left:0};if(!this.$viewport)return s;var n=this.options.viewport&&this.options.viewport.padding||0,r=this.getPosition(this.$viewport);if(/right|left/.test(t)){var a=e.top-n-r.scroll,l=e.top+n-r.scroll+o;a<r.top?s.top=r.top-a:l>r.top+r.height&&(s.top=r.top+r.height-l)}else{var h=e.left-n,d=e.left+n+i;h<r.left?s.left=r.left-h:d>r.width&&(s.left=r.left+r.width-d)}return s},i.prototype.getTitle=function(){var t,e=this.$element,i=this.options;return t=e.attr("data-original-title")||("function"==typeof i.title?i.title.call(e[0]):i.title)},i.prototype.getUID=function(t){do t+=~~(1e6*Math.random());while(document.getElementById(t));return t},i.prototype.tip=function(){return this.$tip=this.$tip||t(this.options.template)},i.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},i.prototype.enable=function(){this.enabled=!0},i.prototype.disable=function(){this.enabled=!1},i.prototype.toggleEnabled=function(){this.enabled=!this.enabled},i.prototype.toggle=function(e){var i=this;e&&(i=t(e.currentTarget).data("bs."+this.type),i||(i=new this.constructor(e.currentTarget,this.getDelegateOptions()),t(e.currentTarget).data("bs."+this.type,i))),i.tip().hasClass("in")?i.leave(i):i.enter(i)},i.prototype.destroy=function(){var t=this;clearTimeout(this.timeout),this.hide(function(){t.$element.off("."+t.type).removeData("bs."+t.type)})};var o=t.fn.tooltip;t.fn.tooltip=e,t.fn.tooltip.Constructor=i,t.fn.tooltip.noConflict=function(){return t.fn.tooltip=o,this}}(jQuery),+function(t){"use strict";function e(e){return this.each(function(){var o=t(this),s=o.data("bs.popover"),n="object"==typeof e&&e,r=n&&n.selector;(s||"destroy"!=e)&&(r?(s||o.data("bs.popover",s={}),s[r]||(s[r]=new i(this,n))):s||o.data("bs.popover",s=new i(this,n)),"string"==typeof e&&s[e]())})}var i=function(t,e){this.init("popover",t,e)};if(!t.fn.tooltip)throw new Error("Popover requires tooltip.js");i.VERSION="3.3.0",i.DEFAULTS=t.extend({},t.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:'<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),i.prototype=t.extend({},t.fn.tooltip.Constructor.prototype),i.prototype.constructor=i,i.prototype.getDefaults=function(){return i.DEFAULTS},i.prototype.setContent=function(){var t=this.tip(),e=this.getTitle(),i=this.getContent();t.find(".popover-title")[this.options.html?"html":"text"](e),t.find(".popover-content").children().detach().end()[this.options.html?"string"==typeof i?"html":"append":"text"](i),t.removeClass("fade top bottom left right in"),t.find(".popover-title").html()||t.find(".popover-title").hide()},i.prototype.hasContent=function(){return this.getTitle()||this.getContent()},i.prototype.getContent=function(){var t=this.$element,e=this.options;return t.attr("data-content")||("function"==typeof e.content?e.content.call(t[0]):e.content)},i.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")},i.prototype.tip=function(){return this.$tip||(this.$tip=t(this.options.template)),this.$tip};var o=t.fn.popover;t.fn.popover=e,t.fn.popover.Constructor=i,t.fn.popover.noConflict=function(){return t.fn.popover=o,this}}(jQuery),+function(t){"use strict";function e(e){return this.each(function(){var o=t(this),s=o.data("bs.tab");s||o.data("bs.tab",s=new i(this)),"string"==typeof e&&s[e]()})}var i=function(e){this.element=t(e)};i.VERSION="3.3.0",i.TRANSITION_DURATION=150,i.prototype.show=function(){var e=this.element,i=e.closest("ul:not(.dropdown-menu)"),o=e.data("target");if(o||(o=e.attr("href"),o=o&&o.replace(/.*(?=#[^\s]*$)/,"")),!e.parent("li").hasClass("active")){var s=i.find(".active:last a"),n=t.Event("hide.bs.tab",{relatedTarget:e[0]}),r=t.Event("show.bs.tab",{relatedTarget:s[0]});if(s.trigger(n),e.trigger(r),!r.isDefaultPrevented()&&!n.isDefaultPrevented()){var a=t(o);this.activate(e.closest("li"),i),this.activate(a,a.parent(),function(){s.trigger({type:"hidden.bs.tab",relatedTarget:e[0]}),e.trigger({type:"shown.bs.tab",relatedTarget:s[0]})})}}},i.prototype.activate=function(e,o,s){function n(){r.removeClass("active").find("> .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),e.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),a?(e[0].offsetWidth,e.addClass("in")):e.removeClass("fade"),e.parent(".dropdown-menu")&&e.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),s&&s()}var r=o.find("> .active"),a=s&&t.support.transition&&(r.length&&r.hasClass("fade")||!!o.find("> .fade").length);r.length&&a?r.one("bsTransitionEnd",n).emulateTransitionEnd(i.TRANSITION_DURATION):n(),r.removeClass("in")};var o=t.fn.tab;t.fn.tab=e,t.fn.tab.Constructor=i,t.fn.tab.noConflict=function(){return t.fn.tab=o,this};var s=function(i){i.preventDefault(),e.call(t(this),"show")};t(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',s).on("click.bs.tab.data-api",'[data-toggle="pill"]',s)}(jQuery),+function(t){"use strict";function e(e){return this.each(function(){var o=t(this),s=o.data("bs.affix"),n="object"==typeof e&&e;s||o.data("bs.affix",s=new i(this,n)),"string"==typeof e&&s[e]()})}var i=function(e,o){this.options=t.extend({},i.DEFAULTS,o),this.$target=t(this.options.target).on("scroll.bs.affix.data-api",t.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",t.proxy(this.checkPositionWithEventLoop,this)),this.$element=t(e),this.affixed=this.unpin=this.pinnedOffset=null,this.checkPosition()};i.VERSION="3.3.0",i.RESET="affix affix-top affix-bottom",i.DEFAULTS={offset:0,target:window},i.prototype.getState=function(t,e,i,o){var s=this.$target.scrollTop(),n=this.$element.offset(),r=this.$target.height();if(null!=i&&"top"==this.affixed)return i>s?"top":!1;if("bottom"==this.affixed)return null!=i?s+this.unpin<=n.top?!1:"bottom":t-o>=s+r?!1:"bottom";var a=null==this.affixed,l=a?s:n.top,h=a?r:e;return null!=i&&i>=l?"top":null!=o&&l+h>=t-o?"bottom":!1},i.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(i.RESET).addClass("affix");var t=this.$target.scrollTop(),e=this.$element.offset();return this.pinnedOffset=e.top-t},i.prototype.checkPositionWithEventLoop=function(){setTimeout(t.proxy(this.checkPosition,this),1)},i.prototype.checkPosition=function(){if(this.$element.is(":visible")){var e=this.$element.height(),o=this.options.offset,s=o.top,n=o.bottom,r=t("body").height();"object"!=typeof o&&(n=s=o),"function"==typeof s&&(s=o.top(this.$element)),"function"==typeof n&&(n=o.bottom(this.$element));var a=this.getState(r,e,s,n);if(this.affixed!=a){null!=this.unpin&&this.$element.css("top","");var l="affix"+(a?"-"+a:""),h=t.Event(l+".bs.affix");if(this.$element.trigger(h),h.isDefaultPrevented())return;this.affixed=a,this.unpin="bottom"==a?this.getPinnedOffset():null,this.$element.removeClass(i.RESET).addClass(l).trigger(l.replace("affix","affixed")+".bs.affix")}"bottom"==a&&this.$element.offset({top:r-e-n})}};var o=t.fn.affix;t.fn.affix=e,t.fn.affix.Constructor=i,t.fn.affix.noConflict=function(){return t.fn.affix=o,this},t(window).on("load",function(){t('[data-spy="affix"]').each(function(){var i=t(this),o=i.data();o.offset=o.offset||{},null!=o.offsetBottom&&(o.offset.bottom=o.offsetBottom),null!=o.offsetTop&&(o.offset.top=o.offsetTop),e.call(i,o)})})}(jQuery),+function(t){"use strict";function e(e){var i,o=e.attr("data-target")||(i=e.attr("href"))&&i.replace(/.*(?=#[^\s]+$)/,"");return t(o)}function i(e){return this.each(function(){var i=t(this),s=i.data("bs.collapse"),n=t.extend({},o.DEFAULTS,i.data(),"object"==typeof e&&e);!s&&n.toggle&&"show"==e&&(n.toggle=!1),s||i.data("bs.collapse",s=new o(this,n)),"string"==typeof e&&s[e]()})}var o=function(e,i){this.$element=t(e),this.options=t.extend({},o.DEFAULTS,i),this.$trigger=t(this.options.trigger).filter('[href="#'+e.id+'"], [data-target="#'+e.id+'"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()};o.VERSION="3.3.0",o.TRANSITION_DURATION=350,o.DEFAULTS={toggle:!0,trigger:'[data-toggle="collapse"]'},o.prototype.dimension=function(){var t=this.$element.hasClass("width");return t?"width":"height"},o.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var e,s=this.$parent&&this.$parent.find("> .panel").children(".in, .collapsing");if(!(s&&s.length&&(e=s.data("bs.collapse"),e&&e.transitioning))){var n=t.Event("show.bs.collapse");if(this.$element.trigger(n),!n.isDefaultPrevented()){s&&s.length&&(i.call(s,"hide"),e||s.data("bs.collapse",null));var r=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[r](0).attr("aria-expanded",!0),this.$trigger.removeClass("collapsed").attr("aria-expanded",!0),this.transitioning=1;var a=function(){this.$element.removeClass("collapsing").addClass("collapse in")[r](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!t.support.transition)return a.call(this);var l=t.camelCase(["scroll",r].join("-"));this.$element.one("bsTransitionEnd",t.proxy(a,this)).emulateTransitionEnd(o.TRANSITION_DURATION)[r](this.$element[0][l])}}}},o.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var e=t.Event("hide.bs.collapse");if(this.$element.trigger(e),!e.isDefaultPrevented()){var i=this.dimension();this.$element[i](this.$element[i]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded",!1),this.$trigger.addClass("collapsed").attr("aria-expanded",!1),this.transitioning=1;var s=function(){this.transitioning=0,this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse")};return t.support.transition?void this.$element[i](0).one("bsTransitionEnd",t.proxy(s,this)).emulateTransitionEnd(o.TRANSITION_DURATION):s.call(this)}}},o.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()},o.prototype.getParent=function(){return t(this.options.parent).find('[data-toggle="collapse"][data-parent="'+this.options.parent+'"]').each(t.proxy(function(i,o){var s=t(o);this.addAriaAndCollapsedClass(e(s),s)},this)).end()},o.prototype.addAriaAndCollapsedClass=function(t,e){var i=t.hasClass("in");t.attr("aria-expanded",i),e.toggleClass("collapsed",!i).attr("aria-expanded",i)};var s=t.fn.collapse;t.fn.collapse=i,t.fn.collapse.Constructor=o,t.fn.collapse.noConflict=function(){return t.fn.collapse=s,this},t(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(o){var s=t(this);s.attr("data-target")||o.preventDefault();var n=e(s),r=n.data("bs.collapse"),a=r?"toggle":t.extend({},s.data(),{trigger:this});i.call(n,a)})}(jQuery),+function(t){"use strict";function e(i,o){var s=t.proxy(this.process,this);this.$body=t("body"),this.$scrollElement=t(t(i).is("body")?window:i),this.options=t.extend({},e.DEFAULTS,o),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",s),this.refresh(),this.process()}function i(i){return this.each(function(){var o=t(this),s=o.data("bs.scrollspy"),n="object"==typeof i&&i;s||o.data("bs.scrollspy",s=new e(this,n)),"string"==typeof i&&s[i]()})}e.VERSION="3.3.0",e.DEFAULTS={offset:10},e.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)
-},e.prototype.refresh=function(){var e="offset",i=0;t.isWindow(this.$scrollElement[0])||(e="position",i=this.$scrollElement.scrollTop()),this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight();var o=this;this.$body.find(this.selector).map(function(){var o=t(this),s=o.data("target")||o.attr("href"),n=/^#./.test(s)&&t(s);return n&&n.length&&n.is(":visible")&&[[n[e]().top+i,s]]||null}).sort(function(t,e){return t[0]-e[0]}).each(function(){o.offsets.push(this[0]),o.targets.push(this[1])})},e.prototype.process=function(){var t,e=this.$scrollElement.scrollTop()+this.options.offset,i=this.getScrollHeight(),o=this.options.offset+i-this.$scrollElement.height(),s=this.offsets,n=this.targets,r=this.activeTarget;if(this.scrollHeight!=i&&this.refresh(),e>=o)return r!=(t=n[n.length-1])&&this.activate(t);if(r&&e<s[0])return this.activeTarget=null,this.clear();for(t=s.length;t--;)r!=n[t]&&e>=s[t]&&(!s[t+1]||e<=s[t+1])&&this.activate(n[t])},e.prototype.activate=function(e){this.activeTarget=e,this.clear();var i=this.selector+'[data-target="'+e+'"],'+this.selector+'[href="'+e+'"]',o=t(i).parents("li").addClass("active");o.parent(".dropdown-menu").length&&(o=o.closest("li.dropdown").addClass("active")),o.trigger("activate.bs.scrollspy")},e.prototype.clear=function(){t(this.selector).parentsUntil(this.options.target,".active").removeClass("active")};var o=t.fn.scrollspy;t.fn.scrollspy=i,t.fn.scrollspy.Constructor=e,t.fn.scrollspy.noConflict=function(){return t.fn.scrollspy=o,this},t(window).on("load.bs.scrollspy.data-api",function(){t('[data-spy="scroll"]').each(function(){var e=t(this);i.call(e,e.data())})})}(jQuery),+function(t){"use strict";function e(){var t=document.createElement("bootstrap"),e={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var i in e)if(void 0!==t.style[i])return{end:e[i]};return!1}t.fn.emulateTransitionEnd=function(e){var i=!1,o=this;t(this).one("bsTransitionEnd",function(){i=!0});var s=function(){i||t(o).trigger(t.support.transition.end)};return setTimeout(s,e),this},t(function(){t.support.transition=e(),t.support.transition&&(t.event.special.bsTransitionEnd={bindType:t.support.transition.end,delegateType:t.support.transition.end,handle:function(e){return t(e.target).is(this)?e.handleObj.handler.apply(this,arguments):void 0}})})}(jQuery);
\ No newline at end of file
diff --git a/Doxygen/doxy-boot.js b/Doxygen/doxy-boot.js
deleted file mode 100755
index a7156c78..00000000
--- a/Doxygen/doxy-boot.js
+++ /dev/null
@@ -1,125 +0,0 @@
-$( document ).ready(function() {
-
-    $("div.headertitle").addClass("page-header");
-    $("div.title").addClass("h1");
-
-    $('li > a[href="index.html"] > span').before("<i class='fa fa-cog'></i> ");
-    $('li > a[href="index.html"] > span').text("globjects");
-    $('li > a[href="modules.html"] > span').before("<i class='fa fa-square'></i> ");
-    $('li > a[href="namespaces.html"] > span').before("<i class='fa fa-bars'></i> ");
-    $('li > a[href="annotated.html"] > span').before("<i class='fa fa-list-ul'></i> ");
-    $('li > a[href="classes.html"] > span').before("<i class='fa fa-book'></i> ");
-    $('li > a[href="inherits.html"] > span').before("<i class='fa fa-sitemap'></i> ");
-    $('li > a[href="functions.html"] > span').before("<i class='fa fa-list'></i> ");
-    $('li > a[href="functions_func.html"] > span').before("<i class='fa fa-list'></i> ");
-    $('li > a[href="functions_vars.html"] > span').before("<i class='fa fa-list'></i> ");
-    $('li > a[href="functions_enum.html"] > span').before("<i class='fa fa-list'></i> ");
-    $('li > a[href="functions_eval.html"] > span').before("<i class='fa fa-list'></i> ");
-
-    //$('img[src="ftv2ns.png"]').replaceWith('<span class="label label-danger">N</span> ');
-    //$('img[src="ftv2cl.png"]').replaceWith('<span class="label label-danger">C</span> ');
-    $('span.icona > span.icon:contains("N")').html('<span class="label label-danger">N</span> ');
-    $('span.icona > span.icon:contains("C")').html('<span class="label label-danger">C</span> ');
-
-    $("ul.tablist li").first().remove();
-    $("ul.tablist").addClass("nav nav-pills nav-justified");
-    $("ul.tablist").css("margin-top", "0.5em");
-    $("ul.tablist").css("margin-bottom", "0.5em");
-    $("li.current").addClass("active");
-    $("iframe").attr("scrolling", "yes");
-
-    $("#nav-path > ul").addClass("breadcrumb");
-
-    $("table.params").addClass("table");
-    $("div.ingroups").wrapInner("<small></small>");
-    $("div.levels").css("margin", "0.5em");
-    $("div.levels > span").addClass("btn btn-default btn-xs");
-    $("div.levels > span").css("margin-right", "0.25em");
-
-    $("table.directory").addClass("table table-striped");
-    $("div.summary > a").addClass("btn btn-default btn-xs");
-    $("table.fieldtable").addClass("table");
-    $(".fragment").addClass("well");
-    $(".memitem").addClass("panel panel-default");
-    $(".memproto").addClass("panel-heading");
-    $(".memdoc").addClass("panel-body");
-    $("span.mlabel").addClass("label label-info");
-
-    $("table.memberdecls").addClass("table");
-    $("[class^=memitem]").addClass("active");
-
-    $("div.ah").addClass("btn btn-default");
-    $("span.mlabels").addClass("pull-right");
-    $("table.mlabels").css("width", "100%")
-    $("td.mlabels-right").addClass("pull-right");
-
-    $("div.ttc").addClass("panel panel-primary");
-    $("div.ttname").addClass("panel-heading");
-    $("div.ttname a").css("color", 'white');
-    $("div.ttdef,div.ttdoc,div.ttdeci").addClass("panel-body");
-
-    $('#MSearchBox').parent().remove();
-
-    $('div.fragment.well div.line:first').css('margin-top', '15px');
-    $('div.fragment.well div.line:last').css('margin-bottom', '15px');
-    
-    $('table.doxtable').removeClass('doxtable').addClass('table table-striped table-bordered').each(function(){
-        $(this).prepend('<thead></thead>');
-        $(this).find('tbody > tr:first').prependTo($(this).find('thead'));
-        
-        $(this).find('td > span.success').parent().addClass('success');
-        $(this).find('td > span.warning').parent().addClass('warning');
-        $(this).find('td > span.danger').parent().addClass('danger');
-    });
-    
-    
-
-    if($('div.fragment.well div.ttc').length > 0)
-    {
-        $('div.fragment.well div.line:first').parent().removeClass('fragment well');
-    }
-
-    $('table.memberdecls').find('.memItemRight').each(function(){
-        $(this).contents().appendTo($(this).siblings('.memItemLeft'));
-        $(this).siblings('.memItemLeft').attr('align', 'left');
-    });
-    
-    function getOriginalWidthOfImg(img_element) {
-        var t = new Image();
-        t.src = (img_element.getAttribute ? img_element.getAttribute("src") : false) || img_element.src;
-        return t.width;
-    }
-    
-/*    $('div.dyncontent').find('img').each(function(){
-        if(getOriginalWidthOfImg($(this)[0]) > $('#content>div.container').width())
-            $(this).css('width', '100%');
-    });
-  */  
-    $(".memitem").removeClass('memitem');
-    $(".memproto").removeClass('memproto');
-    $(".memdoc").removeClass('memdoc');
-    $("span.mlabel").removeClass('mlabel');
-    $("table.memberdecls").removeClass('memberdecls');
-    $("[class^=memitem]").removeClass('memitem');
-    $("span.mlabels").removeClass('mlabels');
-    $("table.mlabels").removeClass('mlabels');
-    $("td.mlabels-right").removeClass('mlabels-right');
-    $(".navpath").removeClass('navpath');
-    $("li.navelem").removeClass('navelem');
-    $("a.el").removeClass('el');
-    $("div.ah").removeClass('ah');
-    $("div.header").removeClass("header");
-    
-    $('.mdescLeft').each(function(){
-        if($(this).html()=="&nbsp;") {
-            $(this).siblings('.mdescRight').attr('colspan', 2);
-            $(this).remove();
-        }
-    });
-    $('td.memItemLeft').each(function(){
-        if($(this).siblings('.memItemRight').html()=="") {
-            $(this).attr('colspan', 2);
-            $(this).siblings('.memItemRight').remove();
-        }
-    });
-});
\ No newline at end of file
diff --git a/Doxygen/doxygen.css b/Doxygen/doxygen.css
deleted file mode 100755
index 07ccf653..00000000
--- a/Doxygen/doxygen.css
+++ /dev/null
@@ -1,38 +0,0 @@
-div.row {
-	margin-top: 20px;
-}
-
-#projectlogo img {
-	margin: 2ex 4ex;
-}
-
-span.icon {
-	padding: 4pt;
-}
-
-.directory .levels {
-    text-align: right;
-}
-
-.directory .levels span {
-    cursor: pointer;
-}
-
-.arrow {
-    color: #f3a01d;
-    -webkit-user-select: none;
-    -khtml-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-    cursor: pointer;
-    font-size: 80%;
-    display: inline-block;
-    width: 16px;
-    height: 22px;
-}
-
-div.dyncontent div.center {
-	text-align: center;
-	padding: 20px 0px;
-}
\ No newline at end of file
diff --git a/Doxygen/footer.html b/Doxygen/footer.html
deleted file mode 100755
index bb602e26..00000000
--- a/Doxygen/footer.html
+++ /dev/null
@@ -1,6 +0,0 @@
-</div>
-</div>
-</div>
-
-</body>
-</html>
diff --git a/Doxygen/generateDocumentationAndroid.sh b/Doxygen/generateDocumentationAndroid.sh
deleted file mode 100755
index ff7e777b..00000000
--- a/Doxygen/generateDocumentationAndroid.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-
-rm -r ../Documentation/
-doxygen "Doxyfile_Android" && cp "doxy-boot.js" ../Documentation/resources/
-echo "<!DOCTYPE HTML>
-    <html lang='en-US'>
-        <head>
-            <meta http-equiv='refresh' content='0;url=resources/pages.html'>
-        </head>
-    </html>" >> ../Documentation/index.html
diff --git a/Doxygen/header.html b/Doxygen/header.html
deleted file mode 100755
index e2f3824b..00000000
--- a/Doxygen/header.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!-- HTML header for doxygen 1.8.8-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen $doxygenversion"/>
-<!--BEGIN PROJECT_NAME--><title>$projectname: $title</title><!--END PROJECT_NAME-->
-<!--BEGIN !PROJECT_NAME--><title>$title</title><!--END !PROJECT_NAME-->
-
-<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet"/>
-<link href="$relpath^bootstrap.min.css" rel="stylesheet"/>
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
-<script src="$relpath^bootstrap.min.js"></script>
-<script type="text/javascript" src="$relpath$doxy-boot.js"></script>
-
-<script type="text/javascript" src="$relpath^dynsections.js"></script>
-$treeview
-$search
-$mathjax
-<link href="$relpath^$stylesheet" rel="stylesheet" type="text/css"/>
-
-</head>
-<body>
-
-<div class="container">
-<div class="row">
-<div class="col-md-offset-1 col-md-10 panel panel-default">
-
-<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
-
-<!--BEGIN TITLEAREA-->
-<div id="titlearea">
-<table cellspacing="0" cellpadding="0">
- <tbody>
- <tr style="height: 56px;">
-  <!--BEGIN PROJECT_LOGO-->
-  <td id="projectlogo"><img alt="Logo" src="$relpath^$projectlogo"/></td>
-  <!--END PROJECT_LOGO-->
-  <!--BEGIN PROJECT_NAME-->
-  <td style="padding-left: 0.5em;">
-   <div id="projectname">$projectname
-   <!--BEGIN PROJECT_NUMBER-->&#160;<span id="projectnumber">$projectnumber</span><!--END PROJECT_NUMBER-->
-   </div>
-   <!--BEGIN PROJECT_BRIEF--><div id="projectbrief">$projectbrief</div><!--END PROJECT_BRIEF-->
-  </td>
-  <!--END PROJECT_NAME-->
-  <!--BEGIN !PROJECT_NAME-->
-   <!--BEGIN PROJECT_BRIEF-->
-    <td style="padding-left: 0.5em;">
-    <div id="projectbrief">$projectbrief</div>
-    </td>
-   <!--END PROJECT_BRIEF-->
-  <!--END !PROJECT_NAME-->
-  <!--BEGIN DISABLE_INDEX-->
-   <!--BEGIN SEARCHENGINE-->
-   <td>$searchbox</td>
-   <!--END SEARCHENGINE-->
-  <!--END DISABLE_INDEX-->
- </tr>
- </tbody>
-</table>
-</div>
-<!--END TITLEAREA-->
-<!-- end header part -->
diff --git a/README.md b/README.md
index 89231331..b16a5851 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ Gradle can restore 3rd-party libraries in your projects.
 
   In your build.gradle module, add in dependencies block :
 
-	   compile 'com.atinternet:Tracker:2.3.4'
+	   compile 'com.atinternet:Tracker:2.3.5'
 
 ### License
 MIT
diff --git a/defaultConfiguration.json b/defaultConfiguration.json
deleted file mode 100644
index 2ea6a7b0..00000000
--- a/defaultConfiguration.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "phone": {
-    "log": "logp",
-    "logSSL": "logs",
-    "domain": "xiti.com",
-    "site": 552987,
-    "storageduration": 4,
-    "storage": "never",
-    "plugins": "",
-    "secure": false,
-    "identifier": "androidId",
-    "hashUserId": false,
-    "pixelPath": "/hit.xiti",
-    "persistIdentifiedVisitor": false,
-    "tvtURL": "",
-    "tvtVisitDuration": 10,
-    "enableCrashDetection": true,
-    "campaignLastPersistence": true,
-    "campaignLifetime": 30
-  },
-  "tablet": {
-    "log": "logp",
-    "logSSL": "logs",
-    "domain": "xiti.com",
-    "site": 552987,
-    "storageduration": 4,
-    "storage": "never",
-    "plugins": "",
-    "secure": false,
-    "identifier": "androidId",
-    "hashUserId": false,
-    "pixelPath": "/hit.xiti",
-    "persistIdentifiedVisitor": false,
-    "tvtURL": "",
-    "tvtVisitDuration": 10,
-    "enableCrashDetection": true,
-    "campaignLastPersistence": true,
-    "campaignLifetime": 30
-  }
-}
\ No newline at end of file