diff --git a/cp/app/Controllers/ContactsController.php b/cp/app/Controllers/ContactsController.php
index 381ab52..b653f97 100644
--- a/cp/app/Controllers/ContactsController.php
+++ b/cp/app/Controllers/ContactsController.php
@@ -365,7 +365,7 @@ class ContactsController extends Controller
             $db->beginTransaction();
 
             try {    
-                $currentDateTime = new DateTime();
+                $currentDateTime = new \DateTime();
                 $crdate = $currentDateTime->format('Y-m-d H:i:s.v');
                 $db->insert(
                     'contact',
diff --git a/cp/app/Controllers/DomainsController.php b/cp/app/Controllers/DomainsController.php
index 06d4de4..e4ebfb9 100644
--- a/cp/app/Controllers/DomainsController.php
+++ b/cp/app/Controllers/DomainsController.php
@@ -335,10 +335,10 @@ class DomainsController extends Controller
             try {
                 $db->beginTransaction();
                 
-                $currentDateTime = new DateTime();
+                $currentDateTime = new \DateTime();
                 $crdate = $currentDateTime->format('Y-m-d H:i:s.v'); // Current timestamp
 
-                $currentDateTime = new DateTime();
+                $currentDateTime = new \DateTime();
                 $currentDateTime->modify("+$date_add months");
                 $exdate = $currentDateTime->format('Y-m-d H:i:s.v'); // Expiry timestamp after $date_add months
 
@@ -503,7 +503,7 @@ class DomainsController extends Controller
                 $from = $row['crdate'];
                 $to = $row['exdate'];
 
-                $currentDateTime = new DateTime();
+                $currentDateTime = new \DateTime();
                 $stdate = $currentDateTime->format('Y-m-d H:i:s.v');
                 $db->insert(
                     'statement',
@@ -540,7 +540,7 @@ class DomainsController extends Controller
                                 ]
                             );
                         } else {
-                            $currentDateTime = new DateTime();
+                            $currentDateTime = new \DateTime();
                             $logdate = $currentDateTime->format('Y-m-d H:i:s.v');
                             $db->insert(
                                 'error_log',
@@ -552,7 +552,7 @@ class DomainsController extends Controller
                             );
                         }
                     } else {
-                        $currentDateTime = new DateTime();
+                        $currentDateTime = new \DateTime();
                         $host_date = $currentDateTime->format('Y-m-d H:i:s.v');
                         $host_id = $db->insert(
                             'host',
diff --git a/cp/app/Controllers/HostsController.php b/cp/app/Controllers/HostsController.php
index b90786b..e9ae40b 100644
--- a/cp/app/Controllers/HostsController.php
+++ b/cp/app/Controllers/HostsController.php
@@ -127,7 +127,7 @@ class HostsController extends Controller
                     $db->beginTransaction();
 
                     try {
-                        $currentDateTime = new DateTime();
+                        $currentDateTime = new \DateTime();
                         $crdate = $currentDateTime->format('Y-m-d H:i:s.v');
                         $db->insert(
                             'host',
@@ -203,7 +203,7 @@ class HostsController extends Controller
                         'registrars' => $registrars,
                     ]);
                 } else {
-                    $currentDateTime = new DateTime();
+                    $currentDateTime = new \DateTime();
                     $crdate = $currentDateTime->format('Y-m-d H:i:s.v');
                     $db->insert(
                         'host',
diff --git a/rdap/start_rdap.php b/rdap/start_rdap.php
index f53e95d..ae64561 100644
--- a/rdap/start_rdap.php
+++ b/rdap/start_rdap.php
@@ -199,11 +199,14 @@ function handleDomainQuery($request, $response, $pdo, $domainName) {
     // Perform the RDAP lookup
     try {
         // Query 1: Get domain details
-        $stmt1 = $pdo->prepare("SELECT *, DATE_FORMAT(`crdate`, '%Y-%m-%dT%TZ') AS `crdate`, DATE_FORMAT(`exdate`, '%Y-%m-%dT%TZ') AS `exdate` FROM `registry`.`domain` WHERE `name` = :domain");
+        $stmt1 = $pdo->prepare("SELECT * FROM `registry`.`domain` WHERE `name` = :domain");
         $stmt1->bindParam(':domain', $domain, PDO::PARAM_STR);
         $stmt1->execute();
         $domainDetails = $stmt1->fetch(PDO::FETCH_ASSOC);
         
+        $domainDetails['crdate'] = (new DateTime($domainDetails['crdate']))->format('Y-m-d\TH:i:s.v\Z');
+        $domainDetails['exdate'] = (new DateTime($domainDetails['exdate']))->format('Y-m-d\TH:i:s.v\Z');
+        
         // Check if the domain exists
         if (!$domainDetails) {
             // Domain not found, respond with a 404 error
diff --git a/whois/port43/start_whois.php b/whois/port43/start_whois.php
index 205bc76..2f9e41f 100644
--- a/whois/port43/start_whois.php
+++ b/whois/port43/start_whois.php
@@ -329,16 +329,20 @@ $server->on('receive', function ($server, $fd, $reactorId, $data) use ($c, $pdo)
 
         // Perform the WHOIS lookup
         try {
-            $query = "SELECT *,
-                DATE_FORMAT(`crdate`, '%Y-%m-%dT%H:%i:%sZ') AS `crdate`,
-                DATE_FORMAT(`update`, '%Y-%m-%dT%H:%i:%sZ') AS `update`,
-                DATE_FORMAT(`exdate`, '%Y-%m-%dT%H:%i:%sZ') AS `exdate`
-                FROM `registry`.`domain` WHERE `name` = :domain";
+            $query = "SELECT * FROM `registry`.`domain` WHERE `name` = :domain";
             $stmt = $pdo->prepare($query);
             $stmt->bindParam(':domain', $domain, PDO::PARAM_STR);
             $stmt->execute();
 
             if ($f = $stmt->fetch(PDO::FETCH_ASSOC)) {
+                $f['crdate'] = (new DateTime($f['crdate']))->format('Y-m-d\TH:i:s.v\Z');
+                if (isset($f['update']) && $f['update'] !== null) {
+                    $f['update'] = (new DateTime($f['update']))->format('Y-m-d\TH:i:s.v\Z');
+                } else {
+                    $f['update'] = '';
+                }
+                $f['exdate'] = (new DateTime($f['exdate']))->format('Y-m-d\TH:i:s.v\Z');
+                
                 $query2 = "SELECT `tld` FROM `domain_tld` WHERE `id` = :tldid";
                 $stmt2 = $pdo->prepare($query2);
                 $stmt2->bindParam(':tldid', $f['tldid'], PDO::PARAM_INT);