diff --git a/README.md b/README.md
index 654d190..a714c84 100644
--- a/README.md
+++ b/README.md
@@ -152,12 +152,12 @@ $response = $client->validateTaxPayerTin($tin, $idType, $idValue);
 use Klsheng\Myinvois\Helper\MyInvoisHelper;
 use Klsheng\Myinvois\Example\Ubl\CreateDocumentExample;
 
-
+$id = 'INV20240418105410';
 $example = new CreateDocumentExample();
-$invoice = $example->createJsonDocument();
+$invoice = $example->createJsonDocument($id);
 
 $documents = [];
-$document = MyInvoisHelper::getSubmitDocument('INV20240418105410', $invoice);
+$document = MyInvoisHelper::getSubmitDocument($id, $invoice);
 $documents[] = $document;
 
 $response = $client->submitDocument($documents);
@@ -168,12 +168,12 @@ $response = $client->submitDocument($documents);
 use Klsheng\Myinvois\Helper\MyInvoisHelper;
 use Klsheng\Myinvois\Example\Ubl\CreateDocumentExample;
 
-
+$id = 'INV20240418105410';
 $example = new CreateDocumentExample();
-$invoice = $example->createXmlDocument();
+$invoice = $example->createXmlDocument($id);
 
 $documents = [];
-$document = MyInvoisHelper::getSubmitDocument('INV20240418105410', $invoice);
+$document = MyInvoisHelper::getSubmitDocument($id, $invoice);
 $documents[] = $document;
 
 $response = $client->submitDocument($documents);
diff --git a/src/Example/Ubl/CreateDocumentExample.php b/src/Example/Ubl/CreateDocumentExample.php
index a0b4dd3..77f6370 100644
--- a/src/Example/Ubl/CreateDocumentExample.php
+++ b/src/Example/Ubl/CreateDocumentExample.php
@@ -55,27 +55,29 @@
 
 class CreateDocumentExample
 {
-    public function createXmlDocument()
+    public function createXmlDocument($id)
     {
-        $document = $this->createDocument();
+        $document = $this->createDocument($id);
 
         $builder = new XmlDocumentBuilder();
         return $builder->getDocument($document);
     }
 
-    public function createJsonDocument()
+    public function createJsonDocument($id)
     {
-        $document = $this->createDocument();
+        $document = $this->createDocument($id);
 
         $builder = new JsonDocumentBuilder();
         return $builder->getDocument($document);
     }
 
-    private function createDocument()
+    private function createDocument($id)
     {
+        $issueDateTime = new \DateTime('now', new \DateTimeZone('UTC'));
+
         $document = new Invoice();
-        $document->setId('INV20240418105410');
-        $document->setIssueDateTime(new \DateTime('2024-05-10 15:30:00Z'));
+        $document->setId($id);
+        $document->setIssueDateTime($issueDateTime);
 
         //$document = $this->setUBLExtension($document);
         $document = $this->setBillingReference($document);
@@ -369,20 +371,21 @@ private function setDocumentLine($document)
         $allowanceCharges[] = $allowanceCharge;
 
         $taxTotal = new TaxTotal();
-        $taxTotal->setTaxAmount(1460.50);
+        $taxTotal->setTaxAmount(14.61);
 
         $taxScheme = new TaxScheme();
         $taxScheme->setId('OTH', 'UN/ECE 5153', '6');
 
         $taxCategory = new TaxCategory();
-        $taxCategory->setId('E');
-        $taxCategory->setPercent('6.00');
+        $taxCategory->setId('01');
+        $taxCategory->setPercent(10.0);
         $taxCategory->setTaxExemptionReason('Exempt New Means of Transport');
         $taxCategory->setTaxScheme($taxScheme);
 
         $taxSubTotal = new TaxSubTotal();
         $taxSubTotal->setTaxableAmount(1460.50);
-        $taxSubTotal->setTaxAmount(0);
+        $taxSubTotal->setTaxAmount(14.61);
+        $taxSubTotal->setPercent(10.0);
         $taxSubTotal->setTaxCategory($taxCategory);
         $taxTotal->addTaxSubTotal($taxSubTotal);
 
diff --git a/src/Ubl/TaxCategory.php b/src/Ubl/TaxCategory.php
index ce1974c..5b9c1ee 100644
--- a/src/Ubl/TaxCategory.php
+++ b/src/Ubl/TaxCategory.php
@@ -65,7 +65,7 @@ public function setName($name)
     }
 
     /**
-     * @return string
+     * @return float
      */
     public function getPercent()
     {
@@ -73,7 +73,7 @@ public function getPercent()
     }
 
     /**
-     * @param string $percent
+     * @param float $percent
      * @return TaxCategory
      */
     public function setPercent($percent)