diff --git a/ATMobileAnalytics/TestApp/build.gradle b/ATMobileAnalytics/TestApp/build.gradle
index 84e00407..773e87a6 100755
--- a/ATMobileAnalytics/TestApp/build.gradle
+++ b/ATMobileAnalytics/TestApp/build.gradle
@@ -35,6 +35,7 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation project(':Tracker')
+    //implementation 'com.atinternet:Tracker:2.20.2'
     implementation 'com.google.android.gms:play-services-ads:16.0.0'
     implementation 'com.huawei.hms:hms-ads-identifier:3.4.26.303'
 
diff --git a/ATMobileAnalytics/TestApp/src/main/java/com/atinternet/MainActivity.java b/ATMobileAnalytics/TestApp/src/main/java/com/atinternet/MainActivity.java
index 3ce02bdd..61046f9d 100644
--- a/ATMobileAnalytics/TestApp/src/main/java/com/atinternet/MainActivity.java
+++ b/ATMobileAnalytics/TestApp/src/main/java/com/atinternet/MainActivity.java
@@ -8,11 +8,9 @@
 
 import com.atinternet.tracker.ATInternet;
 import com.atinternet.tracker.Privacy;
-import com.atinternet.tracker.Screen;
 import com.atinternet.tracker.Tracker;
 
 import java.util.HashMap;
-import java.util.Map;
 
 public class MainActivity extends AppCompatActivity implements View.OnClickListener {
 
@@ -27,23 +25,21 @@ protected void onCreate(Bundle savedInstanceState) {
         findViewById(R.id.setVisitorExempt).setOnClickListener(this);
         findViewById(R.id.setVisitorNoConsent).setOnClickListener(this);
         findViewById(R.id.setVisitorNone).setOnClickListener(this);
+        findViewById(R.id.setVisitorCustom1).setOnClickListener(this);
+        findViewById(R.id.setVisitorCustom2).setOnClickListener(this);
         findViewById(R.id.sendHit).setOnClickListener(this);
         findViewById(R.id.sendHitPage).setOnClickListener(this);
         findViewById(R.id.goToSecondScreen).setOnClickListener(this);
 
-        tracker = ATInternet.getInstance().getDefaultTracker()
-                .setDefaultListener();
+        tracker = ATInternet.getInstance().getDefaultTracker().setDefaultListener();
         tracker.setConfig(new HashMap<String, Object>() {{
             put("logSSL", "logs");
-            put("log", "logp");
             put("domain", "xiti.com");
-            put("pixelPath", "/hit.xiti");
             put("identifier", "uuid");
-            put("site", 999999);
-            put("UUIDDuration", 1);
+            put("site", 410501);
         }}, null, true);
-        Privacy.extendIncludeBuffer("events_name", "events_data_av_duration", "events_data_av_p*", "stc_test6");
-        Privacy.extendIncludeBuffer(Privacy.VisitorMode.Exempt, "events_name", "events_data_av_duration", "events_data_av_p*", "stc_test6");
+        Privacy.extendIncludeBuffer("test");
+        Privacy.extendIncludeBuffer(Privacy.VisitorMode.Exempt, "test");
     }
 
     @Override
@@ -64,6 +60,13 @@ public void onClick(View v) {
             case R.id.setVisitorNone:
                 Privacy.setVisitorMode(Privacy.VisitorMode.None);
                 break;
+            case R.id.setVisitorCustom1:
+                Privacy.setVisitorMode("custom1", true, null, 1);
+                Privacy.extendIncludeBufferForVisitorMode("custom1", "p");
+                break;
+            case R.id.setVisitorCustom2:
+                Privacy.setVisitorMode("custom2", false, "pas-consent");
+                break;
             case R.id.sendHit:
                 tracker.CustomObjects().add(new HashMap<String, Object>() {{
                     put("test", "12");
@@ -72,10 +75,11 @@ public void onClick(View v) {
                 tracker.AVInsights().Media().playbackStart(0, null);
                 break;
             case R.id.sendHitPage:
-                tracker.CustomObjects().add(new HashMap<String, Object>() {{
-                    put("test", "12");
-                    put("test6", "2");
-                }});
+                tracker.Screens().add("homepage");
+                tracker.setProps(new HashMap<String, String>() {{
+                    put("n:contentId", "1234");
+                    put("ressort", "politics");
+                }}, false);
                 tracker.Screens().add("test_privacy").sendView();
                 break;
             case R.id.goToSecondScreen:
diff --git a/ATMobileAnalytics/TestApp/src/main/res/layout/activity_main.xml b/ATMobileAnalytics/TestApp/src/main/res/layout/activity_main.xml
index 44f9be8f..a92d1831 100755
--- a/ATMobileAnalytics/TestApp/src/main/res/layout/activity_main.xml
+++ b/ATMobileAnalytics/TestApp/src/main/res/layout/activity_main.xml
@@ -44,6 +44,18 @@
             android:layout_height="wrap_content"
             android:text="set Visitor None" />
 
+        <Button
+            android:id="@+id/setVisitorCustom1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="set Visitor Custom1" />
+
+        <Button
+            android:id="@+id/setVisitorCustom2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="set Visitor Custom2" />
+
         <Button
             android:id="@+id/sendHit"
             android:layout_width="wrap_content"
diff --git a/ATMobileAnalytics/Tracker/build.gradle b/ATMobileAnalytics/Tracker/build.gradle
index e60a3a87..89ab3b6d 100644
--- a/ATMobileAnalytics/Tracker/build.gradle
+++ b/ATMobileAnalytics/Tracker/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'jacoco'
 apply from: './publish-mavencentral.gradle'
 
 group = 'com.atinternet'
-version = '2.20.2'
+version = '2.21.0'
 
 android {
     compileSdkVersion 30
diff --git a/ATMobileAnalytics/Tracker/publish-mavencentral.gradle b/ATMobileAnalytics/Tracker/publish-mavencentral.gradle
index 701a349a..e897e162 100644
--- a/ATMobileAnalytics/Tracker/publish-mavencentral.gradle
+++ b/ATMobileAnalytics/Tracker/publish-mavencentral.gradle
@@ -15,7 +15,7 @@ publishing {
         release(MavenPublication) {
             groupId 'com.atinternet'
             artifactId 'Tracker'
-            version '2.20.2'
+            version '2.21.0'
 
             artifact(project.buildDir.absolutePath + "/outputs/aar/${project.getName()}-release.aar")
             artifact androidSourcesJar
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Core.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Core.java
index 2cef84d5..aadc2e5c 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Core.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Core.java
@@ -453,7 +453,7 @@ public void run() {
         ArrayList<String> urls = buildResult.first;
         String oltParameter = buildResult.second;
 
-        if ((TechnicalContext.optOutEnabled(Tracker.getAppContext()) || Privacy.getVisitorMode() == Privacy.VisitorMode.OptOut) && !((boolean) tracker.getConfiguration().get(TrackerConfigurationKeys.SEND_HIT_WHEN_OPT_OUT))) {
+        if ((TechnicalContext.optOutEnabled(Tracker.getAppContext()) || Privacy.getVisitorModeString().equals(Privacy.VisitorMode.OptOut.name())) && !((boolean) tracker.getConfiguration().get(TrackerConfigurationKeys.SEND_HIT_WHEN_OPT_OUT))) {
             Tool.executeCallback(tracker.getListener(), Tool.CallbackType.WARNING, "'sendHitWhenOptOut' configuration disabled, hit(s) not sent");
             return;
         }
@@ -1060,7 +1060,7 @@ class TechnicalContext {
     static final Closure VTAG = new Closure() {
         @Override
         public String execute() {
-            return "2.20.2";
+            return "2.21.0";
         }
     };
 
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Privacy.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Privacy.java
index 04b18174..c9a86013 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Privacy.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Privacy.java
@@ -1,6 +1,7 @@
 package com.atinternet.tracker;
 
 import android.content.SharedPreferences;
+import android.text.TextUtils;
 import android.util.Log;
 import android.util.Pair;
 
@@ -21,28 +22,64 @@
 public final class Privacy {
 
     public enum VisitorMode {
-        OptOut,
-        OptIn,
-        NoConsent,
-        Exempt,
-        None
+        OptOut("optout"),
+        OptIn("optin"),
+        NoConsent("no-consent"),
+        Exempt("exempt"),
+        None(null);
+
+        private final String str;
+
+        VisitorMode(String val) {
+            str = val;
+        }
+
+        public String stringValue() {
+            return str;
+        }
     }
 
     private static final String wildcard = "*";
 
-    private static final Map<VisitorMode, Set<String>> includeBufferByMode = createIncludeBufferByModeMap();
+    private static final int defaultDuration = 397;
+
+    private static final Map<String, Set<String>> includeBufferByMode = initIncludeBufferByModeMap();
+
+    private static final Map<String, Boolean> visitorConsentByMode = initVisitorConsentByModeMap();
+
+    private static final Map<String, String> userIdByMode = initUserIdByModeMap();
 
     private static final List<String> specificKeys = new ArrayList<>(Arrays.asList("stc", "events", "context"));
 
     private static final List<String> JSONParameters = new ArrayList<>(Arrays.asList("events", "context"));
 
-    private static Map<VisitorMode, Set<String>> createIncludeBufferByModeMap() {
-        Map<VisitorMode, Set<String>> m = new HashMap<>();
-        m.put(VisitorMode.None, new HashSet<>(Collections.singletonList("*")));
-        m.put(VisitorMode.OptIn, new HashSet<>(Collections.singletonList("*")));
-        m.put(VisitorMode.OptOut, new HashSet<>(Arrays.asList("idclient", "ts", "olt", "cn", "click", "type")));
-        m.put(VisitorMode.NoConsent, new HashSet<>(Arrays.asList("idclient", "ts", "olt", "cn", "click", "type")));
-        m.put(VisitorMode.Exempt, new HashSet<>(Arrays.asList("idclient", "p", "olt", "vtag", "ptag", "ts", "click", "type", "cn", "dg", "apvr", "mfmd", "model", "manufacturer", "os", "stc_crash_*")));
+    private static Map<String, Set<String>> initIncludeBufferByModeMap() {
+        Map<String, Set<String>> m = new HashMap<>();
+        m.put(VisitorMode.None.name(), new HashSet<>(Collections.singletonList("*")));
+        m.put(VisitorMode.OptIn.name(), new HashSet<>(Collections.singletonList("*")));
+        m.put(VisitorMode.OptOut.name(), new HashSet<>(Arrays.asList("idclient", "ts", "olt", "cn", "click", "type")));
+        m.put(VisitorMode.NoConsent.name(), new HashSet<>(Arrays.asList("idclient", "ts", "olt", "cn", "click", "type")));
+        m.put(VisitorMode.Exempt.name(), new HashSet<>(Arrays.asList("idclient", "p", "olt", "vtag", "ptag", "ts", "click", "type", "cn", "dg", "apvr", "mfmd", "model", "manufacturer", "os", "stc_crash_*")));
+        return m;
+    }
+
+    private static Map<String, Boolean> initVisitorConsentByModeMap() {
+        Map<String, Boolean> m = new HashMap<>();
+        m.put(VisitorMode.None.name(), true);
+        m.put(VisitorMode.OptIn.name(), true);
+        m.put(VisitorMode.OptOut.name(), false);
+        m.put(VisitorMode.NoConsent.name(), false);
+        m.put(VisitorMode.Exempt.name(), false);
+        return m;
+    }
+
+    private static Map<String, String> initUserIdByModeMap() {
+        Map<String, String> m = new HashMap<>();
+        m.put(VisitorMode.None.name(), null);
+        m.put(VisitorMode.OptIn.name(), null);
+        m.put(VisitorMode.OptOut.name(), "opt-out");
+        m.put(VisitorMode.NoConsent.name(), "Consent-NO");
+        m.put(VisitorMode.Exempt.name(), null);
         return m;
     }
 
@@ -69,7 +106,7 @@ public static void setVisitorOptIn() {
      * @param visitorMode selected mode from user context
      */
     public static void setVisitorMode(VisitorMode visitorMode) {
-        setVisitorMode(visitorMode, 397);
+        setVisitorMode(visitorMode, defaultDuration);
     }
 
     /***
@@ -78,49 +115,114 @@ public static void setVisitorMode(VisitorMode visitorMode) {
      * @param duration storage validity for privacy information (in days)
      */
     public static void setVisitorMode(VisitorMode visitorMode, int duration) {
+        Boolean visitorConsent = visitorConsentByMode.get(visitorMode.name());
+        setVisitorMode(visitorMode.name(), visitorConsent, userIdByMode.get(visitorMode.name()), duration);
+    }
+
+    /***
+     * Set User Privacy custom mode
+     * @param visitorMode selected mode from user context
+     * @param visitorConsent visitor consent to tracking
+     * @param customUserIdValue optional custom user id
+     */
+    public static void setVisitorMode(String visitorMode, boolean visitorConsent, String customUserIdValue) {
+        setVisitorMode(visitorMode, visitorConsent, customUserIdValue, defaultDuration);
+    }
+
+    /***
+     * Set User Privacy custom mode
+     * @param visitorMode selected mode from user context
+     * @param visitorConsent visitor consent to tracking
+     * @param customUserIdValue optional custom user id
+     * @param duration storage validity for privacy information (in days)
+     */
+    public static void setVisitorMode(String visitorMode, boolean visitorConsent, String customUserIdValue, int duration) {
+        if (TextUtils.isEmpty(visitorMode)) {
+            return;
+        }
+
         SharedPreferences.Editor editor = Tracker.getPreferences().edit();
-        if (visitorMode != VisitorMode.OptIn && visitorMode != VisitorMode.None) {
-            editor.putString(TrackerConfigurationKeys.VISITOR_NUMERIC, null)
-                    .putString(TrackerConfigurationKeys.VISITOR_CATEGORY, null)
-                    .putString(TrackerConfigurationKeys.VISITOR_TEXT, null);
+        if (!(visitorMode.equals(VisitorMode.None.name()) || visitorMode.equals(VisitorMode.OptIn.name()))) {
+            editor.remove(TrackerConfigurationKeys.VISITOR_NUMERIC)
+                    .remove(TrackerConfigurationKeys.VISITOR_CATEGORY)
+                    .remove(TrackerConfigurationKeys.VISITOR_TEXT);
         }
 
-        editor.putString(TrackerConfigurationKeys.PRIVACY_MODE, visitorMode.name())
+        editor.putString(TrackerConfigurationKeys.PRIVACY_MODE, visitorMode)
                 .putLong(TrackerConfigurationKeys.PRIVACY_MODE_EXPIRATION_TIMESTAMP, Utility.currentTimeMillis() + (duration * 86_400_000L)) /// days to millis
+                .putBoolean(TrackerConfigurationKeys.PRIVACY_VISITOR_CONSENT, visitorConsent)
+                .putString(TrackerConfigurationKeys.PRIVACY_USER_ID, customUserIdValue)
                 .apply();
     }
 
     /***
      * Get current User Privacy mode
      * @return user privacy mode
+     * @deprecated Since 2.21.0, use getVisitorModeString() instead
      */
+    @Deprecated
     public static VisitorMode getVisitorMode() {
+        try {
+            return VisitorMode.valueOf(getVisitorModeString());
+        } catch (IllegalArgumentException ignored) {
+            return null;
+        }
+    }
+
+    /***
+     * Get current User Privacy mode
+     * @return user privacy mode
+     */
+    public static String getVisitorModeString() {
         SharedPreferences prefs = Tracker.getPreferences();
         long privacyModeExpirationTs = prefs.getLong(TrackerConfigurationKeys.PRIVACY_MODE_EXPIRATION_TIMESTAMP, -1);
         if (Utility.currentTimeMillis() >= privacyModeExpirationTs) {
             prefs.edit()
-                    .putString(TrackerConfigurationKeys.PRIVACY_MODE, VisitorMode.None.name())
-                    .putLong(TrackerConfigurationKeys.PRIVACY_MODE_EXPIRATION_TIMESTAMP, -1)
+                    .remove(TrackerConfigurationKeys.PRIVACY_MODE)
+                    .remove(TrackerConfigurationKeys.PRIVACY_MODE_EXPIRATION_TIMESTAMP)
+                    .remove(TrackerConfigurationKeys.PRIVACY_USER_ID)
+                    .remove(TrackerConfigurationKeys.PRIVACY_VISITOR_CONSENT)
                     .apply();
         }
-        return VisitorMode.valueOf(prefs.getString(TrackerConfigurationKeys.PRIVACY_MODE, VisitorMode.None.name()));
+        return prefs.getString(TrackerConfigurationKeys.PRIVACY_MODE, VisitorMode.None.name());
     }
 
+
     public static void extendIncludeBuffer(String... keys) {
-        extendIncludeBuffer(getVisitorMode(), keys);
+        extendIncludeBufferForVisitorMode(getVisitorModeString(), keys);
     }
 
     public static void extendIncludeBuffer(VisitorMode visitorMode, String... keys) {
+        extendIncludeBufferForVisitorMode(visitorMode.name(), keys);
+    }
+
+    /***
+     * Extend include buffer for visitor mode set in parameter
+     * @param visitorMode selected mode from user context
+     * @param keys keys to include in the hit
+     */
+    public static void extendIncludeBufferForVisitorMode(String visitorMode, String... keys) {
+        if (TextUtils.isEmpty(visitorMode)) {
+            return;
+        }
+
         List<String> lowercaseKeys = new ArrayList<>();
         for (String k : keys) {
             lowercaseKeys.add(k.toLowerCase());
         }
+
+        if (includeBufferByMode.get(visitorMode) == null) {
+            includeBufferByMode.put(visitorMode, new HashSet<>(includeBufferByMode.get(VisitorMode.OptOut.name())));
+        }
         includeBufferByMode.get(visitorMode).addAll(lowercaseKeys);
     }
 
     static LinkedHashMap<String, Pair<String, String>> apply(LinkedHashMap<String, Pair<String, String>> parameters) {
-        VisitorMode currentPrivacyMode = getVisitorMode();
+        String currentPrivacyMode = getVisitorModeString();
         Set<String> includeBufferKeys = includeBufferByMode.get(currentPrivacyMode);
+        if (includeBufferKeys == null) {
+            includeBufferKeys = includeBufferByMode.get(VisitorMode.OptOut.name());
+        }
 
         LinkedHashMap<String, Pair<String, String>> result = new LinkedHashMap<>();
         Map<String, List<String>> specificIncludedKeys = new HashMap<>();
@@ -175,27 +277,40 @@ static LinkedHashMap<String, Pair<String, String>> apply(LinkedHashMap<String, P
             }
         }
 
-        switch (currentPrivacyMode) {
-            case OptIn:
-                result.put("vc", new Pair<>("&vc=1", ","));
-                result.put("vm", new Pair<>("&vm=optin", ","));
-                break;
-            case OptOut:
-                result.put("vc", new Pair<>("&vc=0", ","));
-                result.put("vm", new Pair<>("&vm=optout", ","));
-                result.put("idclient", new Pair<>("&idclient=opt-out", ","));
-                break;
-            case NoConsent:
-                result.put("vc", new Pair<>("&vc=0", ","));
-                result.put("vm", new Pair<>("&vm=no-consent", ","));
-                result.put("idclient", new Pair<>("&idclient=Consent-NO", ","));
-                break;
-            case Exempt:
-                result.put("vc", new Pair<>("&vc=0", ","));
-                result.put("vm", new Pair<>("&vm=exempt", ","));
-                break;
-            default: /// None
-                break;
+        if (!currentPrivacyMode.equals(VisitorMode.None.name())) {
+            VisitorMode mode = null;
+            if (currentPrivacyMode.equals(VisitorMode.OptIn.name())) {
+                mode = VisitorMode.OptIn;
+            } else if (currentPrivacyMode.equals(VisitorMode.OptOut.name())) {
+                mode = VisitorMode.OptOut;
+            } else if (currentPrivacyMode.equals(VisitorMode.NoConsent.name())) {
+                mode = VisitorMode.NoConsent;
+            } else if (currentPrivacyMode.equals(VisitorMode.Exempt.name())) {
+                mode = VisitorMode.Exempt;
+            }
+
+            String visitorModeValue;
+            String visitorConsentValue;
+            String userIdValue;
+            if (mode != null) {
+                visitorModeValue = mode.stringValue();
+                visitorConsentValue = visitorConsentByMode.get(mode.name()) ? "1" : "0";
+                userIdValue = userIdByMode.get(mode.name());
+            } else {
+                /// CUSTOM
+                SharedPreferences prefs = Tracker.getPreferences();
+                visitorModeValue = prefs.getString(TrackerConfigurationKeys.PRIVACY_MODE, null);
+                visitorConsentValue = prefs.getBoolean(TrackerConfigurationKeys.PRIVACY_VISITOR_CONSENT, true) ? "1" : "0";
+                userIdValue = prefs.getString(TrackerConfigurationKeys.PRIVACY_USER_ID, null);
+            }
+
+            if (visitorModeValue != null) {
+                result.put("vm", new Pair<>(String.format("&vm=%s", visitorModeValue), ","));
+                result.put("vc", new Pair<>(String.format("&vc=%s", visitorConsentValue), ","));
+                if (userIdValue != null) {
+                    result.put("idclient", new Pair<>(String.format("&idclient=%s", userIdValue), ","));
+                }
+            }
         }
 
         return result;
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 1f1e852c..cffb66fd 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/TrackerConfigurationKeys.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/TrackerConfigurationKeys.java
@@ -63,6 +63,10 @@ public final class TrackerConfigurationKeys {
     //Global key representing privacy mode
     static final String PRIVACY_MODE = "ATPrivacyMode";
 
+    static final String PRIVACY_VISITOR_CONSENT = "ATPrivacyVisitorConsent";
+
+    static final String PRIVACY_USER_ID = "ATPrivacyUserId";
+
     //Global key representing privacy mode
     static final String PRIVACY_MODE_EXPIRATION_TIMESTAMP = "ATPrivacyModeExpirationTimestamp";
 
diff --git a/README.md b/README.md
index d6b31ea1..18a52a58 100644
--- a/README.md
+++ b/README.md
@@ -6,25 +6,24 @@ To help you, the tag makes available classes (helpers) enabling the quick implem
 * Tag Android
 
 ### How to get started
-  - Install our library on your project (see below)
-  - Check out the [documentation page] for an overview of the functionalities and code examples
+* Install our library on your project (see below)
+* Check out the [documentation page] for an overview of the functionalities and code examples
 
 ### Manual integration
 Find the integration information by following [this link]
 
-###Installation with Gradle
+### Installation with Gradle
 
 Gradle can restore 3rd-party libraries in your projects.
 
-###Dependency
+### Dependency
 
-  In your build.gradle module, add in dependencies block :
+In your build.gradle module, add in dependencies block :
 
-   implementation 'com.atinternet:Tracker:2.20.2'
+`implementation 'com.atinternet:Tracker:2.X.X' /// >= 2.14.0`
 
 ### License
 MIT
 
-
-   [this link]: <http://developers.atinternet-solutions.com/android-en/getting-started/operating-principle-android-en//>
-   [documentation page]: <http://developers.atinternet-solutions.com/android-en/getting-started/operating-principle-android-en//>
+[this link]: <http://developers.atinternet-solutions.com/android-en/getting-started/operating-principle-android-en//>
+[documentation page]: <http://developers.atinternet-solutions.com/android-en/getting-started/operating-principle-android-en//>