diff --git a/README.md b/README.md
index fe0a116..7449600 100644
--- a/README.md
+++ b/README.md
@@ -20,10 +20,10 @@ If you need support using AfterShip products, please contact support@aftership.c
   - [Error Handling](#error-handling)
     - [Error List](#error-list)
   - [Endpoints](#endpoints)
+    - [/trackings](#trackings)
     - [/couriers](#couriers)
     - [/courier-connections](#courier-connections)
     - [/estimated-delivery-date](#estimated-delivery-date)
-    - [/trackings](#trackings)
   - [Help](#help)
   - [License](#license)
 
@@ -47,7 +47,7 @@ Before you begin to integrate:
 <dependency>
     <groupId>com.aftership</groupId>
     <artifactId>tracking-sdk</artifactId>
-    <version>10.0.1</version>
+    <version>10.0.2</version>
 </dependency>
 ```
 
@@ -144,6 +144,14 @@ The SDK will return an error object when there is any error during the request,
 
 The AfterShip SDK has the following resource which are exactly the same as the API endpoints:
 
+- TrackingResource
+  - Get trackings
+  - Create a tracking
+  - Get a tracking by ID
+  - Update a tracking by ID
+  - Delete a tracking by ID
+  - Retrack an expired tracking by ID
+  - Mark tracking as completed by ID
 - CourierResource
   - Get couriers
   - Detect courier
@@ -156,177 +164,169 @@ The AfterShip SDK has the following resource which are exactly the same as the A
 - EstimatedDeliveryDateResource
   - Prediction for the Estimated Delivery Date
   - Batch prediction for the Estimated Delivery Date
-- TrackingResource
-  - Get trackings
-  - Create a tracking
-  - Get a tracking by ID
-  - Update a tracking by ID
-  - Delete a tracking by ID
-  - Retrack an expired tracking by ID
-  - Mark tracking as completed by ID
 
-### /couriers
-**GET** /couriers
+### /trackings
+**GET** /trackings
 
 ```java
-    GetCouriersResponse response = CourierResource.getCouriers()
+    GetTrackingsResponse response = TrackingResource.getTrackings()
         .fetch();
     System.out.println(response.getData());
 ```
 
-**POST** /couriers/detect
+**POST** /trackings
 
 ```java
-    DetectCourierRequest request = new DetectCourierRequest();
+    CreateTrackingRequest request = new CreateTrackingRequest();
     request.setTrackingNumber("valid_value");
-    DetectCourierResponse response = CourierResource.detectCourier()
-        .setDetectCourierRequest(request)
+    CreateTrackingResponse response = TrackingResource.createTracking()
+        .setCreateTrackingRequest(request)
         .create();
     System.out.println(response.getData());
 ```
 
-### /courier-connections
-**GET** /courier-connections
+**GET** /trackings/{id}
 
 ```java
-    GetCourierConnectionsResponse response = CourierConnectionResource.getCourierConnections()
+    GetTrackingByIdResponse response = TrackingResource.getTrackingById()
+        .setId("valid_value")
         .fetch();
     System.out.println(response.getData());
 ```
 
-**POST** /courier-connections
+**PUT** /trackings/{id}
 
 ```java
-    PostCourierConnectionsRequest request = new PostCourierConnectionsRequest();
-    request.setCourierSlug("valid_value");
-    request.setCredentials();
-    PostCourierConnectionsResponse response = CourierConnectionResource.postCourierConnections()
-        .setPostCourierConnectionsRequest(request)
-        .create();
+    UpdateTrackingByIdRequest request = new UpdateTrackingByIdRequest();
+    UpdateTrackingByIdResponse response = TrackingResource.updateTrackingById()
+        .setId("valid_value")
+        .setUpdateTrackingByIdRequest(request)
+        .update();
     System.out.println(response.getData());
 ```
 
-**GET** /courier-connections/{id}
+**DELETE** /trackings/{id}
 
 ```java
-    GetCourierConnectionsByIdResponse response = CourierConnectionResource.getCourierConnectionsById()
+    DeleteTrackingByIdResponse response = TrackingResource.deleteTrackingById()
         .setId("valid_value")
-        .fetch();
+        .delete();
     System.out.println(response.getData());
 ```
 
-**PATCH** /courier-connections/{id}
+**POST** /trackings/{id}/retrack
 
 ```java
-    PutCourierConnectionsByIdRequest request = new PutCourierConnectionsByIdRequest();
-    request.setCredentials();
-    PutCourierConnectionsByIdResponse response = CourierConnectionResource.putCourierConnectionsById()
+    RetrackTrackingByIdResponse response = TrackingResource.retrackTrackingById()
         .setId("valid_value")
-        .setPutCourierConnectionsByIdRequest(request)
-        .update();
+        .create();
     System.out.println(response.getData());
 ```
 
-**DELETE** /courier-connections/{id}
+**POST** /trackings/{id}/mark-as-completed
 
 ```java
-    DeleteCourierConnectionsByIdResponse response = CourierConnectionResource.deleteCourierConnectionsById()
+    MarkTrackingCompletedByIdRequest request = new MarkTrackingCompletedByIdRequest();
+    MarkTrackingCompletedByIdResponse response = TrackingResource.markTrackingCompletedById()
         .setId("valid_value")
-        .delete();
+        .setMarkTrackingCompletedByIdRequest(request)
+        .create();
     System.out.println(response.getData());
 ```
 
-### /estimated-delivery-date
-**POST** /estimated-delivery-date/predict
+### /couriers
+**GET** /couriers
 
 ```java
-    EstimatedDeliveryDateRequest request = new EstimatedDeliveryDateRequest();
-    request.setSlug("valid_value");
-    EstimatedDeliveryDateRequestOriginAddress originAddress = new EstimatedDeliveryDateRequestOriginAddress();
-    request.setOriginAddress(originAddress);
-    EstimatedDeliveryDateRequestDestinationAddress destinationAddress = new EstimatedDeliveryDateRequestDestinationAddress();
-    request.setDestinationAddress(destinationAddress);
-    PredictResponse response = EstimatedDeliveryDateResource.predict()
-        .setPredictRequest(request)
-        .create();
+    GetCouriersResponse response = CourierResource.getCouriers()
+        .fetch();
     System.out.println(response.getData());
 ```
 
-**POST** /estimated-delivery-date/predict-batch
+**POST** /couriers/detect
 
 ```java
-    PredictBatchRequest request = new PredictBatchRequest();
-    PredictBatchResponse response = EstimatedDeliveryDateResource.predictBatch()
-        .setPredictBatchRequest(request)
+    DetectCourierRequest request = new DetectCourierRequest();
+    request.setTrackingNumber("valid_value");
+    DetectCourierResponse response = CourierResource.detectCourier()
+        .setDetectCourierRequest(request)
         .create();
     System.out.println(response.getData());
 ```
 
-### /trackings
-**GET** /trackings
+### /courier-connections
+**GET** /courier-connections
 
 ```java
-    GetTrackingsResponse response = TrackingResource.getTrackings()
+    GetCourierConnectionsResponse response = CourierConnectionResource.getCourierConnections()
         .fetch();
     System.out.println(response.getData());
 ```
 
-**POST** /trackings
+**POST** /courier-connections
 
 ```java
-    CreateTrackingRequest request = new CreateTrackingRequest();
-    request.setTrackingNumber("valid_value");
-    CreateTrackingResponse response = TrackingResource.createTracking()
-        .setCreateTrackingRequest(request)
+    PostCourierConnectionsRequest request = new PostCourierConnectionsRequest();
+    request.setCourierSlug("valid_value");
+    request.setCredentials();
+    PostCourierConnectionsResponse response = CourierConnectionResource.postCourierConnections()
+        .setPostCourierConnectionsRequest(request)
         .create();
     System.out.println(response.getData());
 ```
 
-**GET** /trackings/{id}
+**GET** /courier-connections/{id}
 
 ```java
-    GetTrackingByIdResponse response = TrackingResource.getTrackingById()
+    GetCourierConnectionsByIdResponse response = CourierConnectionResource.getCourierConnectionsById()
         .setId("valid_value")
         .fetch();
     System.out.println(response.getData());
 ```
 
-**PUT** /trackings/{id}
+**PATCH** /courier-connections/{id}
 
 ```java
-    UpdateTrackingByIdRequest request = new UpdateTrackingByIdRequest();
-    UpdateTrackingByIdResponse response = TrackingResource.updateTrackingById()
+    PutCourierConnectionsByIdRequest request = new PutCourierConnectionsByIdRequest();
+    request.setCredentials();
+    PutCourierConnectionsByIdResponse response = CourierConnectionResource.putCourierConnectionsById()
         .setId("valid_value")
-        .setUpdateTrackingByIdRequest(request)
+        .setPutCourierConnectionsByIdRequest(request)
         .update();
     System.out.println(response.getData());
 ```
 
-**DELETE** /trackings/{id}
+**DELETE** /courier-connections/{id}
 
 ```java
-    DeleteTrackingByIdResponse response = TrackingResource.deleteTrackingById()
+    DeleteCourierConnectionsByIdResponse response = CourierConnectionResource.deleteCourierConnectionsById()
         .setId("valid_value")
         .delete();
     System.out.println(response.getData());
 ```
 
-**POST** /trackings/{id}/retrack
+### /estimated-delivery-date
+**POST** /estimated-delivery-date/predict
 
 ```java
-    RetrackTrackingByIdResponse response = TrackingResource.retrackTrackingById()
-        .setId("valid_value")
+    EstimatedDeliveryDateRequest request = new EstimatedDeliveryDateRequest();
+    request.setSlug("valid_value");
+    EstimatedDeliveryDateRequestOriginAddress originAddress = new EstimatedDeliveryDateRequestOriginAddress();
+    request.setOriginAddress(originAddress);
+    EstimatedDeliveryDateRequestDestinationAddress destinationAddress = new EstimatedDeliveryDateRequestDestinationAddress();
+    request.setDestinationAddress(destinationAddress);
+    PredictResponse response = EstimatedDeliveryDateResource.predict()
+        .setPredictRequest(request)
         .create();
     System.out.println(response.getData());
 ```
 
-**POST** /trackings/{id}/mark-as-completed
+**POST** /estimated-delivery-date/predict-batch
 
 ```java
-    MarkTrackingCompletedByIdRequest request = new MarkTrackingCompletedByIdRequest();
-    MarkTrackingCompletedByIdResponse response = TrackingResource.markTrackingCompletedById()
-        .setId("valid_value")
-        .setMarkTrackingCompletedByIdRequest(request)
+    PredictBatchRequest request = new PredictBatchRequest();
+    PredictBatchResponse response = EstimatedDeliveryDateResource.predictBatch()
+        .setPredictBatchRequest(request)
         .create();
     System.out.println(response.getData());
 ```
diff --git a/pom.xml b/pom.xml
index b3ec00e..1aa5f26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.aftership</groupId>
     <artifactId>tracking-sdk</artifactId>
-    <version>10.0.1</version>
+    <version>10.0.2</version>
 
     <name>AfterShip Tracking SDK</name>
     <description>The official AfterShip Tracking Java API library</description>
diff --git a/src/main/java/com/aftership/tracking/http/HttpClient.java b/src/main/java/com/aftership/tracking/http/HttpClient.java
index 44d401b..66c1c3a 100644
--- a/src/main/java/com/aftership/tracking/http/HttpClient.java
+++ b/src/main/java/com/aftership/tracking/http/HttpClient.java
@@ -30,7 +30,7 @@
 
 public class HttpClient {
 
-    private static final String DEFAULT_USER_AGENT = "tracking-sdk-java/10.0.1 (https://www.aftership.com) apache-httpclient/4.5.14";
+    private static final String DEFAULT_USER_AGENT = "tracking-sdk-java/10.0.2 (https://www.aftership.com) apache-httpclient/4.5.14";
     protected final org.apache.http.client.HttpClient client;
 
     public HttpClient(final RequestConfig requestConfig, String userAgent) {
diff --git a/src/main/java/com/aftership/tracking/http/Request.java b/src/main/java/com/aftership/tracking/http/Request.java
index 594045a..2ec46d8 100644
--- a/src/main/java/com/aftership/tracking/http/Request.java
+++ b/src/main/java/com/aftership/tracking/http/Request.java
@@ -32,6 +32,7 @@ public void setDomain(final String domain) throws Exception {
         URIBuilder validateURI = new URIBuilder(domain);
         uriBuilder.setHost(validateURI.getHost());
         uriBuilder.setScheme(validateURI.getScheme());
+        uriBuilder.setPort(validateURI.getPort());
     }
 
     public void setAuth(final String apiKey, final String apiSecret, final AuthType authenticationType) throws Exception {