diff --git a/changelog.md b/changelog.md
index 42a19a6b..2004b85f 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## v1.3.3
+-Fix:
+    - Constructor in Java class files now include missing headers
+### Apr 09, 2024  
+
 ## v1.3.2
 
 ### March 28, 2024
diff --git a/pom.xml b/pom.xml
index 8730036f..d61421dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>cms</artifactId>
     <packaging>jar</packaging>
     <name>contentstack-management-java</name>
-    <version>1.3.2</version>
+    <version>1.3.3</version>
     <description>Contentstack Java Management SDK for Content Management API, Contentstack is a headless CMS with an
         API-first approach
     </description>
diff --git a/src/main/java/com/contentstack/cms/stack/Alias.java b/src/main/java/com/contentstack/cms/stack/Alias.java
index 1da9ca72..b939b4ac 100644
--- a/src/main/java/com/contentstack/cms/stack/Alias.java
+++ b/src/main/java/com/contentstack/cms/stack/Alias.java
@@ -35,8 +35,9 @@ public class Alias implements BaseImplementation<Alias> {
     // also creates an
     // instance of the `AliasService` interface using the provided `Retrofit`
     // instance.
-    protected Alias(Retrofit instance) {
+    protected Alias(Retrofit instance,Map<String, Object> headers) {
         this.headers = new HashMap<>();
+        this.headers.putAll(headers);
         this.headers.put("Content-Type", "application/json");
         params = new HashMap<>();
         this.service = instance.create(AliasService.class);
@@ -45,8 +46,9 @@ protected Alias(Retrofit instance) {
     // The `protected Alias(Retrofit instance, String aliasUid)` constructor is used
     // to create an
     // instance of the `Alias` class with a specific alias UID.
-    protected Alias(Retrofit instance, String aliasUid) {
+    protected Alias(Retrofit instance,Map<String, Object> headers, String aliasUid) {
         this.headers = new HashMap<>();
+        this.headers.putAll(headers);
         this.headers.put("Content-Type", "application/json");
         params = new HashMap<>();
         this.uid = aliasUid;
diff --git a/src/main/java/com/contentstack/cms/stack/Asset.java b/src/main/java/com/contentstack/cms/stack/Asset.java
index 7c42e134..122d43db 100644
--- a/src/main/java/com/contentstack/cms/stack/Asset.java
+++ b/src/main/java/com/contentstack/cms/stack/Asset.java
@@ -117,7 +117,7 @@ protected void clearParams() {
      * @return Folder
      */
     public Folder folder() {
-        return new Folder(this.instance);
+        return new Folder(this.instance,this.headers);
     }
 
     /**
@@ -127,7 +127,7 @@ public Folder folder() {
      * @return Folder
      */
     public Folder folder(@NotNull String folderUid) {
-        return new Folder(this.instance, folderUid);
+        return new Folder(this.instance,this.headers, folderUid);
     }
 
     /**
diff --git a/src/main/java/com/contentstack/cms/stack/AuditLog.java b/src/main/java/com/contentstack/cms/stack/AuditLog.java
index 6e7b30d2..83df9bcd 100644
--- a/src/main/java/com/contentstack/cms/stack/AuditLog.java
+++ b/src/main/java/com/contentstack/cms/stack/AuditLog.java
@@ -7,6 +7,7 @@
 import retrofit2.Retrofit;
 
 import java.util.HashMap;
+import java.util.Map;
 import java.util.Objects;
 
 /**
@@ -37,14 +38,16 @@ public class AuditLog implements BaseImplementation<AuditLog> {
     protected HashMap<String, Object> params;
     private String logItemUid;
 
-    protected AuditLog(Retrofit retrofit) {
+    protected AuditLog(Retrofit retrofit,Map<String, Object> headers) {
         this.headers = new HashMap<>();
+        this.headers.putAll(headers);
         this.params = new HashMap<>();
         this.service = retrofit.create(AuditLogService.class);
     }
 
-    protected AuditLog(Retrofit retrofit, String uid) {
+    protected AuditLog(Retrofit retrofit,Map<String, Object> headers, String uid) {
         this.headers = new HashMap<>();
+        this.headers.putAll(headers);
         this.params = new HashMap<>();
         this.logItemUid = uid;
         this.service = retrofit.create(AuditLogService.class);
diff --git a/src/main/java/com/contentstack/cms/stack/Branch.java b/src/main/java/com/contentstack/cms/stack/Branch.java
index e67987c4..e10d6bee 100644
--- a/src/main/java/com/contentstack/cms/stack/Branch.java
+++ b/src/main/java/com/contentstack/cms/stack/Branch.java
@@ -34,15 +34,17 @@ public class Branch implements BaseImplementation<Branch> {
     private Retrofit instance;
     private String baseBranchId;
 
-    protected Branch(Retrofit instance) {
+    protected Branch(Retrofit instance,Map<String, Object> headers) {
         this.headers = new HashMap<>();
+        this.headers.putAll(headers);
         this.headers.put("Content-Type", "application/json");
         this.params = new HashMap<>();
         this.service = instance.create(BranchService.class);
     }
 
-    protected Branch(Retrofit instance, String uid) {
+    protected Branch(Retrofit instance,Map<String, Object> headers, String uid) {
         this.headers = new HashMap<>();
+        this.headers.putAll(headers);
         this.headers.put("Content-Type", "application/json");
         this.baseBranchId = uid;
         this.params = new HashMap<>();
diff --git a/src/main/java/com/contentstack/cms/stack/BulkOperation.java b/src/main/java/com/contentstack/cms/stack/BulkOperation.java
index 506420a3..8b40ab9f 100644
--- a/src/main/java/com/contentstack/cms/stack/BulkOperation.java
+++ b/src/main/java/com/contentstack/cms/stack/BulkOperation.java
@@ -8,6 +8,7 @@
 import retrofit2.Retrofit;
 
 import java.util.HashMap;
+import java.util.Map;
 
 /**
  * You can perform bulk operations such as Publish, Unpublished, and Delete on
@@ -48,8 +49,9 @@ public class BulkOperation implements BaseImplementation<BulkOperation> {
      *
      * @param retrofit the retrofit
      */
-    protected BulkOperation(Retrofit retrofit) {
+    protected BulkOperation(Retrofit retrofit,Map<String, Object> headers) {
         this.headers = new HashMap<>();
+        this.headers.putAll(headers);
         this.params = new HashMap<>();
         this.retrofit = retrofit;
         this.service = this.retrofit.create(BulkOperationService.class);
diff --git a/src/main/java/com/contentstack/cms/stack/DeliveryToken.java b/src/main/java/com/contentstack/cms/stack/DeliveryToken.java
index 1cb30e93..8c113fdf 100644
--- a/src/main/java/com/contentstack/cms/stack/DeliveryToken.java
+++ b/src/main/java/com/contentstack/cms/stack/DeliveryToken.java
@@ -7,6 +7,7 @@
 import retrofit2.Call;
 
 import java.util.HashMap;
+import java.util.Map;
 import java.util.Objects;
 
 /**
@@ -31,14 +32,16 @@ public class DeliveryToken implements BaseImplementation<DeliveryToken> {
     private String tokenUid;
     String ERROR = "Token UID Can Not Be Null OR Empty";
 
-    protected DeliveryToken(TokenService service) {
+    protected DeliveryToken(TokenService service, Map<String, Object> headers) {
         this.headers = new HashMap<>();
+        this.headers.putAll(headers);
         this.params = new HashMap<>();
         this.service = service;
     }
 
-    protected DeliveryToken(TokenService service, @NotNull String tokenUid) {
+    protected DeliveryToken(TokenService service, Map<String, Object> headers, @NotNull String tokenUid) {
         this.headers = new HashMap<>();
+        this.headers.putAll(headers);
         this.params = new HashMap<>();
         this.tokenUid = tokenUid;
         this.service = service;
diff --git a/src/main/java/com/contentstack/cms/stack/Environment.java b/src/main/java/com/contentstack/cms/stack/Environment.java
index fdbfde50..e2e76c0c 100644
--- a/src/main/java/com/contentstack/cms/stack/Environment.java
+++ b/src/main/java/com/contentstack/cms/stack/Environment.java
@@ -27,15 +27,17 @@ public class Environment implements BaseImplementation<Environment> {
     protected final EnvironmentService service;
     protected String environment;
 
-    protected Environment(Retrofit instance) {
+    protected Environment(Retrofit instance, Map<String, Object> headers) {
         this.headers = new HashMap<>();
+        this.headers.putAll(headers);
         this.params = new HashMap<>();
         this.service = instance.create(EnvironmentService.class);
     }
 
-    protected Environment(Retrofit instance, String environment) {
+    protected Environment(Retrofit instance, Map<String, Object> headers, String environment) {
         this.environment = environment;
         this.headers = new HashMap<>();
+        this.headers.putAll(headers);
         this.params = new HashMap<>();
         this.service = instance.create(EnvironmentService.class);
     }
diff --git a/src/main/java/com/contentstack/cms/stack/Extensions.java b/src/main/java/com/contentstack/cms/stack/Extensions.java
index 75bd8ea0..063399ad 100644
--- a/src/main/java/com/contentstack/cms/stack/Extensions.java
+++ b/src/main/java/com/contentstack/cms/stack/Extensions.java
@@ -36,14 +36,16 @@ public class Extensions implements BaseImplementation<Extensions> {
     protected HashMap<String, Object> params;
     protected String customFieldUid;
 
-    protected Extensions(Retrofit retrofit) {
+    protected Extensions(Retrofit retrofit,Map<String, Object> headers) {
         this.headers = new HashMap<>();
+        this.headers.putAll(headers);
         this.params = new HashMap<>();
         this.service = retrofit.create(ExtensionsService.class);
     }
 
-    protected Extensions(Retrofit retrofit, String fieldUid) {
+    protected Extensions(Retrofit retrofit,Map<String, Object> headers, String fieldUid) {
         this.headers = new HashMap<>();
+        this.headers.putAll(headers);
         this.params = new HashMap<>();
         this.customFieldUid = fieldUid;
         this.service = retrofit.create(ExtensionsService.class);
diff --git a/src/main/java/com/contentstack/cms/stack/Folder.java b/src/main/java/com/contentstack/cms/stack/Folder.java
index b8211427..a249b598 100644
--- a/src/main/java/com/contentstack/cms/stack/Folder.java
+++ b/src/main/java/com/contentstack/cms/stack/Folder.java
@@ -18,14 +18,16 @@ public class Folder implements BaseImplementation<Folder> {
     protected final AssetService service;
     private String folderUid;
 
-    protected Folder(Retrofit instance) {
+    protected Folder(Retrofit instance,Map<String, Object> headers) {
         this.headers = new HashMap<>();
+        this.headers.putAll(headers);
         params = new HashMap<>();
         this.service = instance.create(AssetService.class);
     }
 
-    protected Folder(Retrofit instance, String folderUid) {
+    protected Folder(Retrofit instance,Map<String, Object> headers, String folderUid) {
         this.headers = new HashMap<>();
+        this.headers.putAll(headers);
         params = new HashMap<>();
         this.folderUid = folderUid;
         this.service = instance.create(AssetService.class);
diff --git a/src/main/java/com/contentstack/cms/stack/GlobalField.java b/src/main/java/com/contentstack/cms/stack/GlobalField.java
index 98df66b5..c35c5688 100644
--- a/src/main/java/com/contentstack/cms/stack/GlobalField.java
+++ b/src/main/java/com/contentstack/cms/stack/GlobalField.java
@@ -8,6 +8,7 @@
 import retrofit2.Retrofit;
 
 import java.util.HashMap;
+import java.util.Map;
 
 /**
  * A Global field is a reusable field (or group of fields) that you can define
@@ -37,14 +38,16 @@ public class GlobalField implements BaseImplementation<GlobalField> {
     protected HashMap<String, Object> params;
     protected String globalFiledUid;
 
-    protected GlobalField(Retrofit retrofit) {
+    protected GlobalField(Retrofit retrofit,Map<String, Object> headers) {
         this.headers = new HashMap<>();
+        this.headers.putAll(headers);
         this.params = new HashMap<>();
         this.service = retrofit.create(GlobalFieldService.class);
     }
 
-    protected GlobalField(Retrofit retrofit, String uid) {
+    protected GlobalField(Retrofit retrofit,Map<String, Object> headers, String uid) {
         this.headers = new HashMap<>();
+        this.headers.putAll(headers);
         this.params = new HashMap<>();
         this.globalFiledUid = uid;
         this.service = retrofit.create(GlobalFieldService.class);
diff --git a/src/main/java/com/contentstack/cms/stack/Label.java b/src/main/java/com/contentstack/cms/stack/Label.java
index fb41369f..bc5be506 100644
--- a/src/main/java/com/contentstack/cms/stack/Label.java
+++ b/src/main/java/com/contentstack/cms/stack/Label.java
@@ -8,6 +8,7 @@
 import retrofit2.Retrofit;
 
 import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Labels allow you to group a collection of content within a stack. Using
@@ -32,15 +33,17 @@ public class Label implements BaseImplementation<Label> {
     protected HashMap<String, Object> params;
     protected String labelUid;
 
-    protected Label(Retrofit retrofit) {
+    protected Label(Retrofit retrofit,Map<String, Object> headers) {
         this.headers = new HashMap<>();
+        this.headers.putAll(headers);
         this.params = new HashMap<>();
         this.service = retrofit.create(LabelService.class);
     }
 
-    protected Label(Retrofit retrofit, String labelUid) {
+    protected Label(Retrofit retrofit,Map<String, Object> headers, String labelUid) {
         this.labelUid = labelUid;
         this.headers = new HashMap<>();
+        this.headers.putAll(headers);
         this.params = new HashMap<>();
         this.service = retrofit.create(LabelService.class);
     }
diff --git a/src/main/java/com/contentstack/cms/stack/Locale.java b/src/main/java/com/contentstack/cms/stack/Locale.java
index 7a337a71..8a1a5bf1 100644
--- a/src/main/java/com/contentstack/cms/stack/Locale.java
+++ b/src/main/java/com/contentstack/cms/stack/Locale.java
@@ -38,14 +38,16 @@ public class Locale implements BaseImplementation<Locale> {
      *
      * @param client the retrofit client
      */
-    public Locale(Retrofit client) {
+    public Locale(Retrofit client,Map<String, Object> headers) {
         this.headers = new HashMap<>();
+        this.headers.putAll(headers);
         this.params = new HashMap<>();
         this.localeService = client.create(LocaleService.class);
     }
 
-    public Locale(Retrofit client, String code) {
+    public Locale(Retrofit client,Map<String, Object> headers, String code) {
         this.headers = new HashMap<>();
+        this.headers.putAll(headers);
         this.code = code;
         this.params = new HashMap<>();
         this.localeService = client.create(LocaleService.class);
diff --git a/src/main/java/com/contentstack/cms/stack/ManagementToken.java b/src/main/java/com/contentstack/cms/stack/ManagementToken.java
index 0c3899ed..edef62bc 100644
--- a/src/main/java/com/contentstack/cms/stack/ManagementToken.java
+++ b/src/main/java/com/contentstack/cms/stack/ManagementToken.java
@@ -7,6 +7,7 @@
 import retrofit2.Call;
 
 import java.util.HashMap;
+import java.util.Map;
 
 /**
  * To authenticate Content Management API (CMA) requests over your stack
@@ -24,14 +25,16 @@ public class ManagementToken implements BaseImplementation<ManagementToken> {
     protected HashMap<String, Object> params;
     private String tokenUid;
 
-    protected ManagementToken(TokenService service) {
+    protected ManagementToken(TokenService service,Map<String, Object> headers) {
         this.headers = new HashMap<>();
+        this.headers.putAll(headers);
         this.params = new HashMap<>();
         this.service = service;
     }
 
-    protected ManagementToken(TokenService service, String tokenUid) {
+    protected ManagementToken(TokenService service,Map<String, Object> headers, String tokenUid) {
         this.headers = new HashMap<>();
+        this.headers.putAll(headers);
         this.params = new HashMap<>();
         this.service = service;
         this.tokenUid = tokenUid;
diff --git a/src/main/java/com/contentstack/cms/stack/PublishQueue.java b/src/main/java/com/contentstack/cms/stack/PublishQueue.java
index 8ab11278..11b8231e 100644
--- a/src/main/java/com/contentstack/cms/stack/PublishQueue.java
+++ b/src/main/java/com/contentstack/cms/stack/PublishQueue.java
@@ -7,6 +7,7 @@
 import retrofit2.Retrofit;
 
 import java.util.HashMap;
+import java.util.Map;
 
 /**
  * The Publish Queue displays the historical and current details of activities
@@ -44,15 +45,17 @@ public class PublishQueue implements BaseImplementation<PublishQueue> {
     private String publishQueueUid;
     private final Retrofit retrofit;
 
-    protected PublishQueue(Retrofit retrofit) {
+    protected PublishQueue(Retrofit retrofit,Map<String, Object> headers) {
         this.headers = new HashMap<>();
+        this.headers.putAll(headers);
         this.params = new HashMap<>();
         this.retrofit = retrofit;
         this.service = this.retrofit.create(PublishQueueService.class);
     }
 
-    protected PublishQueue(Retrofit retrofit, String uid) {
+    protected PublishQueue(Retrofit retrofit,Map<String, Object> headers, String uid) {
         this.headers = new HashMap<>();
+        this.headers.putAll(headers);
         this.params = new HashMap<>();
         this.retrofit = retrofit;
         this.publishQueueUid = uid;
diff --git a/src/main/java/com/contentstack/cms/stack/Release.java b/src/main/java/com/contentstack/cms/stack/Release.java
index 3a137082..39b0a8b4 100644
--- a/src/main/java/com/contentstack/cms/stack/Release.java
+++ b/src/main/java/com/contentstack/cms/stack/Release.java
@@ -8,6 +8,7 @@
 import retrofit2.Retrofit;
 
 import java.util.HashMap;
+import java.util.Map;
 
 /**
  * You can pin a set of entries and assets (along with the deploy action, i.e.,
@@ -38,15 +39,17 @@ public class Release implements BaseImplementation<Release> {
     protected String releaseUid;
     private final Retrofit retrofit;
 
-    protected Release(Retrofit retrofit) {
+    protected Release(Retrofit retrofit,Map<String, Object> headers) {
         this.headers = new HashMap<>();
+        this.headers.putAll(headers);
         this.params = new HashMap<>();
         this.retrofit = retrofit;
         this.service = this.retrofit.create(ReleaseService.class);
     }
 
-    protected Release(Retrofit retrofit, String uid) {
+    protected Release(Retrofit retrofit,Map<String, Object> headers, String uid) {
         this.headers = new HashMap<>();
+        this.headers.putAll(headers);
         this.params = new HashMap<>();
         this.releaseUid = uid;
         this.retrofit = retrofit;
@@ -254,7 +257,7 @@ public Call<ResponseBody> delete() {
      */
     public ReleaseItem item() {
         validate();
-        return new ReleaseItem(this.retrofit, this.releaseUid);
+        return new ReleaseItem(this.retrofit,this.headers, this.releaseUid);
     }
 
     /**
diff --git a/src/main/java/com/contentstack/cms/stack/ReleaseItem.java b/src/main/java/com/contentstack/cms/stack/ReleaseItem.java
index c728ac5c..bf55891a 100644
--- a/src/main/java/com/contentstack/cms/stack/ReleaseItem.java
+++ b/src/main/java/com/contentstack/cms/stack/ReleaseItem.java
@@ -8,6 +8,7 @@
 import retrofit2.Retrofit;
 
 import java.util.HashMap;
+import java.util.Map;
 
 /**
  * The Get all items in a Release request retrieves a list of all items (entries
@@ -29,8 +30,9 @@ public class ReleaseItem implements BaseImplementation<ReleaseItem> {
     protected HashMap<String, Object> params;
     private final String releaseUid;
 
-    protected ReleaseItem(Retrofit retrofit, String releaseUid) {
+    protected ReleaseItem(Retrofit retrofit,Map<String, Object> headers, String releaseUid) {
         this.headers = new HashMap<>();
+        this.headers.putAll(headers);
         this.params = new HashMap<>();
         this.releaseUid = releaseUid;
         this.service = retrofit.create(ReleaseService.class);
diff --git a/src/main/java/com/contentstack/cms/stack/Roles.java b/src/main/java/com/contentstack/cms/stack/Roles.java
index 2b85a2ee..bf0955e3 100644
--- a/src/main/java/com/contentstack/cms/stack/Roles.java
+++ b/src/main/java/com/contentstack/cms/stack/Roles.java
@@ -8,6 +8,7 @@
 import retrofit2.Retrofit;
 
 import java.util.HashMap;
+import java.util.Map;
 
 /**
  * A role is a collection of permissions that will be applicable to all the
@@ -27,14 +28,16 @@ public class Roles implements BaseImplementation<Roles> {
     protected HashMap<String, Object> params;
     protected String roleUid;
 
-    protected Roles(Retrofit retrofit) {
+    protected Roles(Retrofit retrofit,Map<String, Object> headers) {
         this.headers = new HashMap<>();
+        this.headers.putAll(headers);
         this.params = new HashMap<>();
         this.service = retrofit.create(RolesService.class);
     }
 
-    protected Roles(Retrofit retrofit, String roleUid) {
+    protected Roles(Retrofit retrofit,Map<String, Object> headers, String roleUid) {
         this.headers = new HashMap<>();
+        this.headers.putAll(headers);
         this.params = new HashMap<>();
         this.roleUid = roleUid;
         this.service = retrofit.create(RolesService.class);
diff --git a/src/main/java/com/contentstack/cms/stack/Stack.java b/src/main/java/com/contentstack/cms/stack/Stack.java
index 2f200aba..f99a43ee 100644
--- a/src/main/java/com/contentstack/cms/stack/Stack.java
+++ b/src/main/java/com/contentstack/cms/stack/Stack.java
@@ -360,7 +360,7 @@ public Asset asset(String assetUid) {
      * @return GlobalField
      */
     public GlobalField globalField() {
-        return new GlobalField(this.client);
+        return new GlobalField(this.client,this.headers);
     }
 
     /**
@@ -374,7 +374,7 @@ public GlobalField globalField() {
      * @return GlobalField
      */
     public GlobalField globalField(@NotNull String globalFiledUid) {
-        return new GlobalField(this.client, globalFiledUid);
+        return new GlobalField(this.client,this.headers,globalFiledUid);
     }
 
     /**
@@ -390,7 +390,7 @@ public GlobalField globalField(@NotNull String globalFiledUid) {
      * "https://www.contentstack.com/docs/developers/multilingual-content">Languages</a>
      */
     public Locale locale() {
-        return new Locale(this.client);
+        return new Locale(this.client,this.headers);
     }
 
     /**
@@ -407,7 +407,7 @@ public Locale locale() {
      * "https://www.contentstack.com/docs/developers/multilingual-content">Languages</a>
      */
     public Locale locale(String code) {
-        return new Locale(this.client, code);
+        return new Locale(this.client,this.headers, code);
     }
 
     /**
@@ -422,7 +422,7 @@ public Locale locale(String code) {
      * "https://www.contentstack.com/docs/developers/set-up-environments">Environments</a>
      */
     public Environment environment() {
-        return new Environment(this.client);
+        return new Environment(this.client,this.headers);
     }
 
     /**
@@ -438,7 +438,7 @@ public Environment environment() {
      * "https://www.contentstack.com/docs/developers/set-up-environments">Environments</a>
      */
     public Environment environment(String environment) {
-        return new Environment(this.client, environment);
+        return new Environment(this.client,this.headers, environment);
     }
 
     /**
@@ -457,7 +457,7 @@ public Environment environment(String environment) {
      * module resides.
      */
     public Label label() {
-        return new Label(this.client);
+        return new Label(this.client,this.headers);
     }
 
     /**
@@ -477,7 +477,7 @@ public Label label() {
      * module resides.
      */
     public Label label(String labelUid) {
-        return new Label(this.client, labelUid);
+        return new Label(this.client,this.headers, labelUid);
     }
 
     /**
@@ -497,7 +497,7 @@ public Label label(String labelUid) {
      * @return instance of {@link Extensions}
      */
     public Extensions extensions() {
-        return new Extensions(this.client);
+        return new Extensions(this.client,this.headers);
     }
 
     /**
@@ -522,7 +522,7 @@ public Extensions extensions() {
      * @return instance of {@link Extensions}
      */
     public Extensions extensions(String customFieldUid) {
-        return new Extensions(this.client, customFieldUid);
+        return new Extensions(this.client,this.headers, customFieldUid);
     }
 
     /**
@@ -543,7 +543,7 @@ public Extensions extensions(String customFieldUid) {
      * @return Tokens
      */
     public Tokens tokens() {
-        return new Tokens(this.client);
+        return new Tokens(this.client,this.headers);
     }
 
     /**
@@ -553,7 +553,7 @@ public Tokens tokens() {
      * @return Role
      */
     public Roles roles() {
-        return new Roles(this.client);
+        return new Roles(this.client,this.headers);
     }
 
     /**
@@ -565,7 +565,7 @@ public Roles roles() {
      * @return Role
      */
     public Roles roles(String roleUid) {
-        return new Roles(this.client, roleUid);
+        return new Roles(this.client, this.headers,roleUid);
     }
 
     /**
@@ -578,7 +578,7 @@ public Roles roles(String roleUid) {
      * @return Release
      */
     public Release releases() {
-        return new Release(this.client);
+        return new Release(this.client,this.headers);
     }
 
     /**
@@ -593,7 +593,7 @@ public Release releases() {
      * @return Release
      */
     public Release releases(String releaseUid) {
-        return new Release(this.client, releaseUid);
+        return new Release(this.client,this.headers,releaseUid);
     }
 
     /**
@@ -607,7 +607,7 @@ public Release releases(String releaseUid) {
      * @return Workflow
      */
     public Workflow workflow() {
-        return new Workflow(this.client);
+        return new Workflow(this.client,this.headers);
     }
 
     /**
@@ -622,7 +622,7 @@ public Workflow workflow() {
      * @return Workflow
      */
     public Workflow workflow(@NotNull String workflowUid) {
-        return new Workflow(this.client, workflowUid);
+        return new Workflow(this.client, this.headers,workflowUid);
     }
 
     /**
@@ -635,7 +635,7 @@ public Workflow workflow(@NotNull String workflowUid) {
      * @return AuditLog
      */
     public AuditLog auditLog() {
-        return new AuditLog(this.client);
+        return new AuditLog(this.client,this.headers);
     }
 
     /**
@@ -649,7 +649,7 @@ public AuditLog auditLog() {
      * @return AuditLog
      */
     public AuditLog auditLog(@NotNull String logItemUid) {
-        return new AuditLog(this.client, logItemUid);
+        return new AuditLog(this.client,this.headers, logItemUid);
     }
 
     /**
@@ -668,7 +668,7 @@ public AuditLog auditLog(@NotNull String logItemUid) {
      * @return PublishQueue
      */
     public PublishQueue publishQueue() {
-        return new PublishQueue(this.client);
+        return new PublishQueue(this.client,this.headers);
     }
 
     /**
@@ -684,7 +684,7 @@ public PublishQueue publishQueue() {
      * @return BulkOperation
      */
     public BulkOperation bulkOperation() {
-        return new BulkOperation(this.client);
+        return new BulkOperation(this.client,this.headers);
     }
 
     /**
@@ -707,7 +707,7 @@ public BulkOperation bulkOperation() {
      * @return PublishQueue
      */
     public PublishQueue publishQueue(@NotNull String publishQueueUid) {
-        return new PublishQueue(this.client, publishQueueUid);
+        return new PublishQueue(this.client,this.headers, publishQueueUid);
     }
 
     /**
@@ -731,7 +731,7 @@ public PublishQueue publishQueue(@NotNull String publishQueueUid) {
      * @return Webhook
      */
     public Webhook webhook() {
-        return new Webhook(this.client);
+        return new Webhook(this.client,this.headers);
     }
 
     /**
@@ -758,7 +758,7 @@ public Webhook webhook() {
      * @return Webhook
      */
     public Webhook webhook(String webhookUid) {
-        return new Webhook(this.client, webhookUid);
+        return new Webhook(this.client,this.headers, webhookUid);
     }
 
     /**
@@ -774,7 +774,7 @@ public Webhook webhook(String webhookUid) {
      * @return Branch
      */
     public Branch branch() {
-        return new Branch(this.client);
+        return new Branch(this.client,this.headers);
     }
 
     /**
@@ -792,7 +792,7 @@ public Branch branch() {
      * @return Branch
      */
     public Branch branch(String branchUid) {
-        return new Branch(this.client, branchUid);
+        return new Branch(this.client,this.headers, branchUid);
     }
 
     /**
@@ -803,7 +803,7 @@ public Branch branch(String branchUid) {
      * @return Alias
      */
     public Alias alias() {
-        return new Alias(this.client);
+        return new Alias(this.client,this.headers);
     }
 
     /**
@@ -818,7 +818,7 @@ public Alias alias() {
      * @return Alias
      */
     public Alias alias(String aliasUid) {
-        return new Alias(this.client, aliasUid);
+        return new Alias(this.client, this.headers,aliasUid);
     }
 
 
diff --git a/src/main/java/com/contentstack/cms/stack/Taxonomy.java b/src/main/java/com/contentstack/cms/stack/Taxonomy.java
index 50640831..b3abca53 100644
--- a/src/main/java/com/contentstack/cms/stack/Taxonomy.java
+++ b/src/main/java/com/contentstack/cms/stack/Taxonomy.java
@@ -42,6 +42,7 @@ public class Taxonomy implements BaseImplementation<Taxonomy> {
      */
     protected Taxonomy(Retrofit client, HashMap<String, Object> headers) {
         this.headers = new HashMap<>();
+        this.headers.putAll(headers);
         this.params = new HashMap<>();
         this.headers.putAll(headers);
         this.taxonomyService = client.create(TaxonomyService.class);
@@ -56,6 +57,7 @@ protected Taxonomy(Retrofit client, HashMap<String, Object> headers) {
      */
     protected Taxonomy(Retrofit client, HashMap<String, Object> headers, @NotNull String taxonomyId) {
         this.headers = new HashMap<>();
+        this.headers.putAll(headers);
         this.params = new HashMap<>();
         this.taxonomyId = taxonomyId;
         this.headers.putAll(headers);
diff --git a/src/main/java/com/contentstack/cms/stack/TokenService.java b/src/main/java/com/contentstack/cms/stack/TokenService.java
index 3d522403..e61099f0 100644
--- a/src/main/java/com/contentstack/cms/stack/TokenService.java
+++ b/src/main/java/com/contentstack/cms/stack/TokenService.java
@@ -10,53 +10,53 @@
 public interface TokenService {
 
     // Delivery Tokens
-    @GET("delivery_tokens")
+    @GET("stacks/delivery_tokens")
     Call<ResponseBody> getDeliveryToken(
             @HeaderMap Map<String, Object> headers);
 
-    @GET("delivery_tokens/{token_uid}")
+    @GET("stacks/delivery_tokens/{token_uid}")
     Call<ResponseBody> getDeliveryToken(
             @HeaderMap Map<String, Object> headers,
             @Path("token_uid") String tokenUid);
 
-    @POST("delivery_tokens")
+    @POST("stacks/delivery_tokens")
     Call<ResponseBody> createDeliveryToken(
             @HeaderMap Map<String, Object> headers,
             @Body JSONObject body);
 
-    @PUT("delivery_tokens/{token_uid}")
+    @PUT("stacks/delivery_tokens/{token_uid}")
     Call<ResponseBody> updateDeliveryToken(
             @HeaderMap Map<String, Object> headers,
             @Path("token_uid") String tokenUid,
             @Body JSONObject body);
 
-    @DELETE("delivery_tokens/{token_uid}")
+    @DELETE("stacks/delivery_tokens/{token_uid}")
     Call<ResponseBody> deleteDeliveryToken(
             @HeaderMap Map<String, Object> headers,
             @Path("token_uid") String tokenUid,
             @Query("force") Boolean force);
 
     // Management Tokens
-    @GET("management_tokens")
+    @GET("stacks/management_tokens")
     Call<ResponseBody> fetchManagementToken(
             @HeaderMap Map<String, Object> headers, @QueryMap Map<String, Object> params);
 
-    @GET("management_tokens/{token_uid}")
+    @GET("stacks/management_tokens/{token_uid}")
     Call<ResponseBody> getSingleManagementToken(
             @HeaderMap Map<String, Object> headers,
             @Path("token_uid") String tokenUid);
 
-    @POST("management_tokens")
+    @POST("stacks/management_tokens")
     Call<ResponseBody> createManagementToken(
             @HeaderMap Map<String, Object> headers,
             @Body JSONObject body);
 
-    @PUT("management_tokens/{token_uid}")
+    @PUT("stacks/management_tokens/{token_uid}")
     Call<ResponseBody> updateManagementToken(
             @HeaderMap Map<String, Object> headers,
             @Path("token_uid") String tokenUid, @Body JSONObject body);
 
-    @DELETE("management_tokens/{token_uid}")
+    @DELETE("stacks/management_tokens/{token_uid}")
     Call<ResponseBody> deleteManagementToken(
             @HeaderMap Map<String, Object> headers,
             @Path("token_uid") String tokenUid);
diff --git a/src/main/java/com/contentstack/cms/stack/Tokens.java b/src/main/java/com/contentstack/cms/stack/Tokens.java
index 62011fe5..35d274d3 100644
--- a/src/main/java/com/contentstack/cms/stack/Tokens.java
+++ b/src/main/java/com/contentstack/cms/stack/Tokens.java
@@ -1,5 +1,7 @@
 package com.contentstack.cms.stack;
 
+import java.util.Map;
+
 import org.jetbrains.annotations.NotNull;
 import retrofit2.Retrofit;
 
@@ -13,9 +15,11 @@
 public class Tokens {
 
     protected final TokenService service;
+     protected final Map<String, Object> headers;
 
-    protected Tokens(Retrofit retrofit) {
+    protected Tokens(Retrofit retrofit,Map<String, Object> headers) {
         this.service = retrofit.create(TokenService.class);
+        this.headers = headers;
     }
 
     /**
@@ -32,7 +36,7 @@ protected Tokens(Retrofit retrofit) {
      * @since 0.1.0
      */
     public DeliveryToken deliveryTokens() {
-        return new DeliveryToken(this.service);
+        return new DeliveryToken(this.service,this.headers);
     }
 
     /**
@@ -51,7 +55,7 @@ public DeliveryToken deliveryTokens() {
      * @since 0.1.0
      */
     public DeliveryToken deliveryTokens(@NotNull String tokenUid) {
-        return new DeliveryToken(this.service, tokenUid);
+        return new DeliveryToken(this.service,this.headers, tokenUid);
     }
 
     /**
@@ -66,7 +70,7 @@ public DeliveryToken deliveryTokens(@NotNull String tokenUid) {
      * @since 0.1.0
      */
     public ManagementToken managementToken() {
-        return new ManagementToken(this.service);
+        return new ManagementToken(this.service,this.headers);
     }
 
     /**
@@ -82,7 +86,7 @@ public ManagementToken managementToken() {
      * @since 0.1.0
      */
     public ManagementToken managementToken(@NotNull String managementTokenUid) {
-        return new ManagementToken(this.service, managementTokenUid);
+        return new ManagementToken(this.service,this.headers, managementTokenUid);
     }
 
 }
diff --git a/src/main/java/com/contentstack/cms/stack/Webhook.java b/src/main/java/com/contentstack/cms/stack/Webhook.java
index 491fcba3..a009fc49 100644
--- a/src/main/java/com/contentstack/cms/stack/Webhook.java
+++ b/src/main/java/com/contentstack/cms/stack/Webhook.java
@@ -12,6 +12,7 @@
 import retrofit2.Retrofit;
 
 import java.util.HashMap;
+import java.util.Map;
 
 /**
  * A webhook is a mechanism that sends real-time information to any third-party
@@ -38,14 +39,16 @@ public class Webhook implements BaseImplementation<Webhook> {
     protected HashMap<String, Object> params;
     private String webhookUid;
 
-    protected Webhook(Retrofit retrofit) {
+    protected Webhook(Retrofit retrofit,Map<String, Object> headers) {
         this.headers = new HashMap<>();
+        this.headers.putAll(headers);
         this.params = new HashMap<>();
         this.service = retrofit.create(WebhookService.class);
     }
 
-    protected Webhook(Retrofit retrofit, String uid) {
+    protected Webhook(Retrofit retrofit,Map<String, Object> headers, String uid) {
         this.headers = new HashMap<>();
+        this.headers.putAll(headers);
         this.params = new HashMap<>();
         this.webhookUid = uid;
         this.service = retrofit.create(WebhookService.class);
diff --git a/src/main/java/com/contentstack/cms/stack/Workflow.java b/src/main/java/com/contentstack/cms/stack/Workflow.java
index 3dbff4dd..8a2d66c9 100644
--- a/src/main/java/com/contentstack/cms/stack/Workflow.java
+++ b/src/main/java/com/contentstack/cms/stack/Workflow.java
@@ -9,6 +9,7 @@
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Workflow is a tool that allows you to streamline the process of content
@@ -31,15 +32,17 @@ public class Workflow implements BaseImplementation<Workflow> {
     protected HashMap<String, Object> params;
     private String workflowUid;
 
-    protected Workflow(Retrofit retrofit) {
+    protected Workflow(Retrofit retrofit,Map<String, Object> headers) {
         this.headers = new HashMap<>();
+        this.headers.putAll(headers);
         this.params = new HashMap<>();
         this.service = retrofit.create(WorkflowService.class);
     }
 
-    protected Workflow(Retrofit retrofit, @NotNull String uid) {
+    protected Workflow(Retrofit retrofit,Map<String, Object> headers, @NotNull String uid) {
         this.workflowUid = uid;
         this.headers = new HashMap<>();
+        this.headers.putAll(headers);
         this.params = new HashMap<>();
         this.service = retrofit.create(WorkflowService.class);
     }
diff --git a/src/test/java/com/contentstack/cms/stack/EnvironmentAPITest.java b/src/test/java/com/contentstack/cms/stack/EnvironmentAPITest.java
index 0f4ce632..05947c41 100644
--- a/src/test/java/com/contentstack/cms/stack/EnvironmentAPITest.java
+++ b/src/test/java/com/contentstack/cms/stack/EnvironmentAPITest.java
@@ -3,6 +3,8 @@
 import com.contentstack.cms.Contentstack;
 import com.contentstack.cms.TestClient;
 import com.contentstack.cms.Utils;
+import com.contentstack.cms.core.Util;
+
 import okhttp3.ResponseBody;
 import org.json.simple.JSONObject;
 import org.junit.jupiter.api.*;
@@ -17,17 +19,21 @@ public class EnvironmentAPITest {
     protected static String API_KEY = TestClient.API_KEY;
     protected static String MANAGEMENT_TOKEN = TestClient.AUTHTOKEN;
     static Environment environment;
+    protected static Stack stackInstance;
+   
 
     @BeforeAll
     public static void setupEnv() {
-        Contentstack contentstack = new Contentstack.Builder().setAuthtoken(AUTHTOKEN).build();
-        Stack stackInstance = contentstack.stack(API_KEY, MANAGEMENT_TOKEN);
+        // Contentstack contentstack = new Contentstack.Builder().setAuthtoken(AUTHTOKEN).build();
+        // Stack stackInstance = contentstack.stack(API_KEY, MANAGEMENT_TOKEN);
+        stackInstance = TestClient.getStack().addHeader(Util.API_KEY, API_KEY)
+                .addHeader("api_key", API_KEY);
         environment = stackInstance.environment("production");
     }
 
     @Test
     @Order(1)
-    void fetchLocales() {
+    void fetchEnvironments() {
         environment.addParam("include_count", false);
         environment.addParam("asc", "created_at");
         environment.addParam("desc", "updated_at");
@@ -46,7 +52,7 @@ void fetchLocales() {
 
     @Test
     @Order(2)
-    void addLocale() {
+    void fetchEnvironment() {
         try {
             Response<ResponseBody> response = environment.fetch().execute();
             if (response.isSuccessful()) {
@@ -61,7 +67,7 @@ void addLocale() {
 
     @Test
     @Order(3)
-    void getLocale() {
+    void createEnvironment() {
         // add_env.json
         JSONObject requestBody = Utils.readJson("environment/add_env.json");
         try {
@@ -78,7 +84,7 @@ void getLocale() {
 
     @Test
     @Order(4)
-    void updateLocale() {
+    void updateEnvironment() {
         JSONObject requestBody = Utils.readJson("environment/add_env.json");
         try {
             Response<ResponseBody> response = environment.update(requestBody).execute();
@@ -94,7 +100,7 @@ void updateLocale() {
 
     @Test
     @Order(5)
-    void deleteLocale() {
+    void deleteEnvironment() {
         try {
             Response<ResponseBody> response = environment.delete().execute();
             if (response.isSuccessful()) {
diff --git a/src/test/java/com/contentstack/cms/stack/LocaleAPITest.java b/src/test/java/com/contentstack/cms/stack/LocaleAPITest.java
index 8fc31213..f28fb7e8 100644
--- a/src/test/java/com/contentstack/cms/stack/LocaleAPITest.java
+++ b/src/test/java/com/contentstack/cms/stack/LocaleAPITest.java
@@ -3,6 +3,8 @@
 import com.contentstack.cms.Contentstack;
 import com.contentstack.cms.TestClient;
 import com.contentstack.cms.Utils;
+import com.contentstack.cms.core.Util;
+
 import okhttp3.ResponseBody;
 import org.json.simple.JSONObject;
 import org.junit.jupiter.api.Assertions;
@@ -20,11 +22,14 @@ public class LocaleAPITest {
     protected static String API_KEY = TestClient.API_KEY;
     protected static String MANAGEMENT_TOKEN = TestClient.MANAGEMENT_TOKEN;
     static Locale locale;
+    protected static Stack stackInstance;
 
     @BeforeAll
     public static void setupEnv() {
-        Contentstack contentstack = new Contentstack.Builder().setAuthtoken(AUTHTOKEN).build();
-        Stack stackInstance = contentstack.stack(API_KEY, MANAGEMENT_TOKEN);
+        // Contentstack contentstack = new Contentstack.Builder().setAuthtoken(AUTHTOKEN).build();
+        // Stack stackInstance = contentstack.stack(API_KEY, MANAGEMENT_TOKEN);
+         stackInstance = TestClient.getStack().addHeader(Util.API_KEY, API_KEY)
+                .addHeader("api_key", API_KEY);
         locale = stackInstance.locale(MANAGEMENT_TOKEN);
     }
 
diff --git a/src/test/java/com/contentstack/cms/stack/TaxonomyAPITest.java b/src/test/java/com/contentstack/cms/stack/TaxonomyAPITest.java
new file mode 100644
index 00000000..197f1083
--- /dev/null
+++ b/src/test/java/com/contentstack/cms/stack/TaxonomyAPITest.java
@@ -0,0 +1,300 @@
+package com.contentstack.cms.stack;
+
+import java.io.IOException;
+import java.util.HashMap;
+
+import org.json.simple.JSONObject;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.*;
+import com.contentstack.cms.Contentstack;
+import com.contentstack.cms.TestClient;
+import com.contentstack.cms.Utils;
+import com.contentstack.cms.core.Util;
+
+import okhttp3.Request;
+import okhttp3.ResponseBody;
+import retrofit2.Response;
+
+
+
+
+@Tag("api")
+public class TaxonomyAPITest {
+    protected static String API_KEY = TestClient.API_KEY;
+    protected static String _uid = "sample_one";
+    protected static String MANAGEMENT_TOKEN = TestClient.MANAGEMENT_TOKEN;
+    protected static Taxonomy taxonomy;
+    protected static Terms terms;
+
+    @BeforeAll
+    static void setup() {
+        final String AUTHTOKEN = TestClient.AUTHTOKEN;
+        HashMap<String, Object> headers = new HashMap<>();
+        headers.put(Util.API_KEY, API_KEY);
+        headers.put(Util.AUTHORIZATION, MANAGEMENT_TOKEN);
+        Stack stack = new Contentstack.Builder().setAuthtoken(AUTHTOKEN).build().stack(headers);
+        taxonomy = stack.taxonomy();
+        terms = stack.taxonomy(_uid).terms();
+    }
+
+    @Test
+    void fetchAll(){
+
+        try {
+            Response<ResponseBody> response = taxonomy.find().execute();
+            System.out.println(response.body().string());
+            if (response.isSuccessful()) {
+                Assertions.assertTrue(response.isSuccessful());
+            } else {
+                Assertions.assertFalse(response.isSuccessful());
+            }
+        } catch (IOException e) {
+            System.out.println("Exception: " + e.getLocalizedMessage());
+        }
+    }
+
+    @Test
+    void fetchSingle() {
+        try {
+            Response<ResponseBody> response = taxonomy.fetch("regions").execute();
+            System.out.println(response);
+            if (response.isSuccessful()) {
+                Assertions.assertTrue(response.isSuccessful());
+            } else {
+                Assertions.assertFalse(response.isSuccessful());
+            }
+        } catch (IOException e) {
+            System.out.println("Exception: " + e.getLocalizedMessage());
+        }
+    }
+
+    @Test
+    void createTaxonomy() throws IOException {
+        // add create.json
+        JSONObject requestBody = Utils.readJson("mocktaxonomy/create.json");
+        taxonomy.addHeader(Util.API_KEY, API_KEY);
+        taxonomy.addHeader(Util.AUTHORIZATION, MANAGEMENT_TOKEN);
+        Request request = taxonomy.create(requestBody).request();
+        Response <ResponseBody> resp = taxonomy.create(requestBody).execute();
+        System.out.println(resp);
+        System.out.println(request);
+        Assertions.assertEquals(2, request.headers().names().size());
+        Assertions.assertEquals("POST", request.method());
+        Assertions.assertTrue(request.url().isHttps());
+        Assertions.assertEquals("api.contentstack.io", request.url().host());
+        Assertions.assertEquals(2, request.url().pathSegments().size());
+        Assertions.assertEquals("v3", request.url().pathSegments().get(0));
+        Assertions.assertEquals("taxonomies", request.url().pathSegments().get(1));
+        Assertions.assertNull(request.url().encodedQuery());
+        Assertions.assertEquals("https://api.contentstack.io/v3/taxonomies", request.url().toString());
+
+    }
+
+    @Test
+    void updateTaxonomy() {
+        JSONObject updateBody = Utils.readJson("mocktaxonomy/update.json");
+        taxonomy.addHeader(Util.API_KEY, API_KEY);
+        taxonomy.addHeader(Util.AUTHORIZATION, MANAGEMENT_TOKEN);
+        Request request = taxonomy.update("sample_one",updateBody).request();
+        System.out.println(request);
+        Assertions.assertEquals(2, request.headers().names().size());
+        Assertions.assertEquals("PUT", request.method());
+        Assertions.assertTrue(request.url().isHttps());
+        Assertions.assertEquals("api.contentstack.io", request.url().host());
+        Assertions.assertEquals(3, request.url().pathSegments().size());
+        Assertions.assertEquals("taxonomies", request.url().pathSegments().get(1));
+        Assertions.assertNotNull(request.body());
+        Assertions.assertNull(request.url().encodedQuery());
+        Assertions.assertEquals("https://api.contentstack.io/v3/taxonomies/sample_one", request.url().toString());
+
+    }
+
+    @Test
+    void deleteTaxonomy(){
+        taxonomy.clearParams();
+        taxonomy.addHeader("Content-Type", "application/json");
+        HashMap<String, String> headers = new HashMap<>();
+        HashMap<String, Object> params = new HashMap<>();
+        headers.put("key_param1", "key_param_value");
+        headers.put("key_param2", "key_param_value");
+        params.put("key_param3", "key_param_value");
+        params.put("key_param4", "key_param_value");
+        taxonomy.addHeaders(headers);
+        taxonomy.addParams(params);
+        Request request = taxonomy.delete("sample_one").request();
+        System.out.println(request);
+        Assertions.assertEquals(5, request.headers().names().size());
+        Assertions.assertEquals("DELETE", request.method());
+        Assertions.assertTrue(request.url().isHttps());
+        Assertions.assertEquals("api.contentstack.io", request.url().host());
+        Assertions.assertEquals(3, request.url().pathSegments().size());
+        Assertions.assertEquals("taxonomies", request.url().pathSegments().get(1));
+        Assertions.assertNull(request.body());
+        Assertions.assertNull(request.url().encodedQuery());
+        Assertions.assertEquals("https://api.contentstack.io/v3/taxonomies/sample_one", request.url().toString());
+    }
+
+    @Test
+    void createTerm() throws IOException {
+        terms.clearParams();
+        JSONObject term = Utils.readJson("mockTaxonomy/createTerm.json");
+        Request request = terms.create(term).request();
+//        Response<ResponseBody> resp= terms.create(term).execute();
+//        System.out.println(resp);
+        Assertions.assertEquals(2, request.headers().names().size());
+        Assertions.assertEquals("POST", request.method());
+        Assertions.assertTrue(request.url().isHttps());
+        Assertions.assertEquals("api.contentstack.io", request.url().host());
+        Assertions.assertEquals(4, request.url().pathSegments().size());
+        Assertions.assertEquals("v3", request.url().pathSegments().get(0));
+        Assertions.assertEquals("taxonomies", request.url().pathSegments().get(1));
+        Assertions.assertEquals(_uid, request.url().pathSegments().get(2));
+        Assertions.assertEquals("terms", request.url().pathSegments().get(3));
+        Assertions.assertNotNull(request.body());
+        Assertions.assertNull(request.url().encodedQuery());
+        Assertions.assertEquals("https://api.contentstack.io/v3/taxonomies/"+ _uid +"/terms",
+                request.url().toString());
+    }
+    @Test
+    void fetchAllTerms() throws IOException {
+        terms.clearParams();
+        terms.addParam("limit", 3);
+        Request request = terms.find().request();
+        Response<ResponseBody> resp = terms.find().execute();
+        System.out.println(resp.body().string());
+        Assertions.assertEquals(2, request.headers().names().size());
+        Assertions.assertEquals("GET", request.method());
+        Assertions.assertTrue(request.url().isHttps());
+        Assertions.assertEquals("api.contentstack.io", request.url().host());
+        Assertions.assertEquals(4, request.url().pathSegments().size());
+        Assertions.assertEquals("v3", request.url().pathSegments().get(0));
+        Assertions.assertEquals("taxonomies", request.url().pathSegments().get(1));
+        Assertions.assertEquals(_uid, request.url().pathSegments().get(2));
+        Assertions.assertEquals("terms", request.url().pathSegments().get(3));
+        Assertions.assertNull(request.body());
+        Assertions.assertEquals("limit=3", request.url().encodedQuery());
+        Assertions.assertEquals("https://api.contentstack.io/v3/taxonomies/"+ _uid +"/terms?limit=3",
+                request.url().toString());
+    }
+
+    @Test
+    void fetchSingleTerm() throws IOException {
+        terms.clearParams();
+        Request request = terms.fetch("india").request();
+//        Response<ResponseBody> resp = terms.fetch("india").execute();
+//        System.out.println(resp);
+        Assertions.assertEquals(2, request.headers().names().size());
+        Assertions.assertEquals("GET", request.method());
+        Assertions.assertTrue(request.url().isHttps());
+        Assertions.assertEquals("api.contentstack.io", request.url().host());
+        Assertions.assertEquals(5, request.url().pathSegments().size());
+        Assertions.assertEquals("v3", request.url().pathSegments().get(0));
+        Assertions.assertEquals("taxonomies", request.url().pathSegments().get(1));
+        Assertions.assertEquals(_uid, request.url().pathSegments().get(2));
+        Assertions.assertEquals("terms", request.url().pathSegments().get(3));
+        Assertions.assertNull(request.url().encodedQuery());
+        Assertions.assertEquals("https://api.contentstack.io/v3/taxonomies/"+ _uid +"/terms/india",
+                request.url().toString());
+    }
+
+    @Test
+    void updateTerm(){
+        JSONObject Newterm = Utils.readJson("mockTaxonomy/updateTerm.json");
+        Request request = terms.update(_uid,Newterm).request();
+        Assertions.assertEquals(2, request.headers().names().size());
+        Assertions.assertEquals("PUT", request.method());
+        Assertions.assertTrue(request.url().isHttps());
+        Assertions.assertEquals("api.contentstack.io", request.url().host());
+        Assertions.assertEquals(5, request.url().pathSegments().size());
+        Assertions.assertEquals("v3", request.url().pathSegments().get(0));
+        Assertions.assertEquals("taxonomies", request.url().pathSegments().get(1));
+        Assertions.assertEquals(_uid, request.url().pathSegments().get(2));
+        Assertions.assertEquals("terms", request.url().pathSegments().get(3));
+        Assertions.assertNotNull(request.body());
+        Assertions.assertNull(request.url().encodedQuery());
+        Assertions.assertEquals("https://api.contentstack.io/v3/taxonomies/"+ _uid +"/terms/sample_one",
+                request.url().toString());
+    }
+
+    @Test
+    void deleteTerm(){
+        Request request = taxonomy.delete("sample_one").request();
+        Assertions.assertEquals(2, request.headers().names().size());
+        Assertions.assertEquals("DELETE", request.method());
+        Assertions.assertTrue(request.url().isHttps());
+        Assertions.assertEquals("api.contentstack.io", request.url().host());
+        Assertions.assertEquals(3, request.url().pathSegments().size());
+        Assertions.assertEquals("v3", request.url().pathSegments().get(0));
+        Assertions.assertEquals("taxonomies", request.url().pathSegments().get(1));
+        Assertions.assertEquals(_uid, request.url().pathSegments().get(2));
+        Assertions.assertNull(request.body());
+        Assertions.assertNull(request.url().encodedQuery());
+        Assertions.assertEquals("https://api.contentstack.io/v3/taxonomies/"+ _uid +"", request.url().toString());
+    }
+
+    @Test
+    void ancestorsTerm(){
+        terms.clearParams();
+        terms.addParam("include_referenced_entries_count", true);
+        terms.addParam("include_children_count", false);
+        Request request = terms.ancestors("term_a2").request();
+        Assertions.assertEquals(2, request.headers().names().size());
+        Assertions.assertEquals("GET", request.method());
+        Assertions.assertTrue(request.url().isHttps());
+        Assertions.assertEquals("api.contentstack.io", request.url().host());
+        Assertions.assertEquals(6, request.url().pathSegments().size());
+        Assertions.assertEquals("v3", request.url().pathSegments().get(0));
+        Assertions.assertEquals("taxonomies", request.url().pathSegments().get(1));
+        Assertions.assertEquals(_uid, request.url().pathSegments().get(2));
+        Assertions.assertEquals("terms", request.url().pathSegments().get(3));
+        Assertions.assertNull(request.body());
+        Assertions.assertEquals("include_children_count=false&include_referenced_entries_count=true",
+                request.url().encodedQuery());
+        Assertions.assertEquals(
+                "https://api.contentstack.io/v3/taxonomies/"+ _uid +"/terms/term_a2/ancestors?include_children_count=false&include_referenced_entries_count=true",
+                request.url().toString());
+
+    }
+
+    @Test
+    void descendantsTerm(){
+        terms.clearParams();
+        terms.addParam("include_count", true);
+        Request request = terms.descendants("term_a2").request();
+        Assertions.assertEquals(2, request.headers().names().size());
+        Assertions.assertEquals("GET", request.method());
+        Assertions.assertTrue(request.url().isHttps());
+        Assertions.assertEquals("api.contentstack.io", request.url().host());
+        Assertions.assertEquals(6, request.url().pathSegments().size());
+        Assertions.assertEquals("v3", request.url().pathSegments().get(0));
+        Assertions.assertEquals("taxonomies", request.url().pathSegments().get(1));
+        Assertions.assertEquals(_uid, request.url().pathSegments().get(2));
+        Assertions.assertEquals("terms", request.url().pathSegments().get(3));
+        Assertions.assertNull(request.body());
+        Assertions.assertEquals("include_count=true", request.url().encodedQuery());
+        Assertions.assertEquals(
+                "https://api.contentstack.io/v3/taxonomies/"+ _uid +"/terms/term_a2/descendants?include_count=true",
+                request.url().toString());
+
+    }
+
+    @Test
+    void moveTerms(){
+        terms.clearParams();
+        HashMap<String, String> headers = new HashMap<>();
+        HashMap<String, Object> params = new HashMap<>();
+        terms.addHeader("Accept-Encoding", "UTF-8");
+        headers.put("Accept-Encoding", "UTF-8");
+        params.put("force", true);
+        terms.addParams(params);
+        terms.addHeaders(headers);
+        Request request = terms.reorder(_uid, new JSONObject()).request();
+        Assertions.assertEquals(3, request.headers().names().size());
+        Assertions.assertEquals("PUT", request.method());
+        Assertions.assertTrue(request.url().isHttps());
+        Assertions.assertEquals("api.contentstack.io", request.url().host());
+        Assertions.assertEquals(6, request.url().pathSegments().size());
+    }
+}
diff --git a/src/test/java/com/contentstack/cms/stack/TokenUnitTest.java b/src/test/java/com/contentstack/cms/stack/TokenUnitTest.java
index d307fa6f..492919ab 100644
--- a/src/test/java/com/contentstack/cms/stack/TokenUnitTest.java
+++ b/src/test/java/com/contentstack/cms/stack/TokenUnitTest.java
@@ -100,7 +100,7 @@ void allDeliveryTokens() {
         Assertions.assertEquals("v3", request.url().pathSegments().get(0));
         Assertions.assertNull(request.url().encodedQuery());
         Assertions.assertEquals(
-                "https://api.contentstack.io/v3/delivery_tokens",
+                "https://api.contentstack.io/v3/stacks/delivery_tokens",
                 request.url().toString());
     }
 
@@ -116,7 +116,7 @@ void singleDeliveryToken() {
         Assertions.assertEquals("v3", request.url().pathSegments().get(0));
         Assertions.assertNull(request.url().encodedQuery());
         Assertions.assertEquals(
-                "https://api.contentstack.io/v3/delivery_tokens/" + _uid,
+                "https://api.contentstack.io/v3/stacks/delivery_tokens/" + _uid,
                 request.url().toString());
     }
 
@@ -132,7 +132,7 @@ void createDeliveryToken() {
         Assertions.assertNotNull(request.body());
         Assertions.assertNull(request.url().encodedQuery());
         Assertions.assertEquals(
-                "https://api.contentstack.io/v3/delivery_tokens",
+                "https://api.contentstack.io/v3/stacks/delivery_tokens",
                 request.url().toString());
     }
 
@@ -146,7 +146,7 @@ void updateDeliveryToken() {
         Assertions.assertEquals(3, request.url().pathSegments().size());
         Assertions.assertEquals("delivery_tokens", request.url().pathSegments().get(1));
         Assertions.assertNull(request.url().encodedQuery());
-        Assertions.assertEquals("https://api.contentstack.io/v3/delivery_tokens/" + _uid, request.url().toString());
+        Assertions.assertEquals("https://api.contentstack.io/v3/stacks/delivery_tokens/" + _uid, request.url().toString());
     }
 
     @Test
@@ -159,7 +159,7 @@ void deleteDeliveryToken() {
         Assertions.assertEquals(3, request.url().pathSegments().size());
         Assertions.assertEquals("delivery_tokens", request.url().pathSegments().get(1));
         Assertions.assertEquals("force=false", request.url().encodedQuery());
-        Assertions.assertEquals("https://api.contentstack.io/v3/delivery_tokens/" + _uid + "?force=false",
+        Assertions.assertEquals("https://api.contentstack.io/v3/stacks/delivery_tokens/" + _uid + "?force=false",
                 request.url().toString());
     }
 
@@ -173,7 +173,7 @@ void deleteDeliveryTokenForcefully() {
         Assertions.assertEquals(3, request.url().pathSegments().size());
         Assertions.assertEquals("delivery_tokens", request.url().pathSegments().get(1));
         Assertions.assertEquals("force=true", request.url().encodedQuery());
-        Assertions.assertEquals("https://api.contentstack.io/v3/delivery_tokens/" + _uid + "?force=true",
+        Assertions.assertEquals("https://api.contentstack.io/v3/stacks/delivery_tokens/" + _uid + "?force=true",
                 request.url().toString());
     }
 
@@ -188,7 +188,7 @@ void allManagementToken() {
         Assertions.assertEquals(2, request.url().pathSegments().size());
         Assertions.assertEquals("management_tokens", request.url().pathSegments().get(1));
         Assertions.assertNull(request.url().encodedQuery());
-        Assertions.assertEquals("https://api.contentstack.io/v3/management_tokens",
+        Assertions.assertEquals("https://api.contentstack.io/v3/stacks/management_tokens",
                 request.url().toString());
     }
 
@@ -203,7 +203,7 @@ void singleManagementToken() {
         Assertions.assertEquals(3, request.url().pathSegments().size());
         Assertions.assertEquals("management_tokens", request.url().pathSegments().get(1));
         Assertions.assertNull(request.url().encodedQuery());
-        Assertions.assertEquals("https://api.contentstack.io/v3/management_tokens/" + _uid, request.url().toString());
+        Assertions.assertEquals("https://api.contentstack.io/v3/stacks/management_tokens/" + _uid, request.url().toString());
     }
 
     @Test
@@ -217,7 +217,7 @@ void createManagementToken() {
         Assertions.assertEquals(2, request.url().pathSegments().size());
         Assertions.assertEquals("management_tokens", request.url().pathSegments().get(1));
         Assertions.assertNull(request.url().encodedQuery());
-        Assertions.assertEquals("https://api.contentstack.io/v3/management_tokens", request.url().toString());
+        Assertions.assertEquals("https://api.contentstack.io/v3/stacks/management_tokens", request.url().toString());
     }
 
     @Test
@@ -231,7 +231,7 @@ void updateManagementToken() {
         Assertions.assertEquals(3, request.url().pathSegments().size());
         Assertions.assertEquals("management_tokens", request.url().pathSegments().get(1));
         Assertions.assertNull(request.url().encodedQuery());
-        Assertions.assertEquals("https://api.contentstack.io/v3/management_tokens/" + _uid, request.url().toString());
+        Assertions.assertEquals("https://api.contentstack.io/v3/stacks/management_tokens/" + _uid, request.url().toString());
     }
 
     @Test
@@ -245,7 +245,7 @@ void deleteManagementToken() {
         Assertions.assertEquals(3, request.url().pathSegments().size());
         Assertions.assertEquals("management_tokens", request.url().pathSegments().get(1));
         Assertions.assertNull(request.url().encodedQuery());
-        Assertions.assertEquals("https://api.contentstack.io/v3/management_tokens/" + _uid, request.url().toString());
+        Assertions.assertEquals("https://api.contentstack.io/v3/stacks/management_tokens/" + _uid, request.url().toString());
     }
 
     @Test
@@ -257,7 +257,7 @@ void testHeaderAndParams() {
         deliveryToken.addParam("key", "Value");
         deliveryToken.removeParam("key");
         Request request = tokens.deliveryTokens().find().request();
-        Assertions.assertEquals("https://api.contentstack.io/v3/delivery_tokens",
+        Assertions.assertEquals("https://api.contentstack.io/v3/stacks/delivery_tokens",
                 request.url().toString());
     }
 }
diff --git a/src/test/resources/mocktaxonomy/create.json b/src/test/resources/mocktaxonomy/create.json
new file mode 100644
index 00000000..9e0c2a8e
--- /dev/null
+++ b/src/test/resources/mocktaxonomy/create.json
@@ -0,0 +1,8 @@
+
+{
+    "taxonomy": {
+      "uid": "sample_one",
+      "name": "Sample One",
+      "description": "Description for the sample one taxonomy."
+    }
+  }
\ No newline at end of file
diff --git a/src/test/resources/mocktaxonomy/createTerm.json b/src/test/resources/mocktaxonomy/createTerm.json
new file mode 100644
index 00000000..439578d5
--- /dev/null
+++ b/src/test/resources/mocktaxonomy/createTerm.json
@@ -0,0 +1,8 @@
+{
+    "term": {
+      "uid": "term_a",
+      "name": "Term A",
+      "description": "Term A Description for Taxonomy sample",
+      "parent_uid": null
+    }
+  }
\ No newline at end of file
diff --git a/src/test/resources/mocktaxonomy/update.json b/src/test/resources/mocktaxonomy/update.json
new file mode 100644
index 00000000..ece28e56
--- /dev/null
+++ b/src/test/resources/mocktaxonomy/update.json
@@ -0,0 +1,6 @@
+{
+    "taxonomy": {
+      "name": "Updated Sample One",
+      "description": "Updated description for the sample one taxonomy."
+    }
+  }
\ No newline at end of file
diff --git a/src/test/resources/mocktaxonomy/updateTerm.json b/src/test/resources/mocktaxonomy/updateTerm.json
new file mode 100644
index 00000000..6c7cafb3
--- /dev/null
+++ b/src/test/resources/mocktaxonomy/updateTerm.json
@@ -0,0 +1,5 @@
+{
+    "term": {
+      "name": "Updated Term A"
+    }
+}
\ No newline at end of file