diff --git a/epp/src/epp-create.php b/epp/src/epp-create.php
index 24fa213..ada2a63 100644
--- a/epp/src/epp-create.php
+++ b/epp/src/epp-create.php
@@ -394,7 +394,6 @@ function processHostCreate($conn, $db, $xml, $clid, $database_type) {
     $hostName = $xml->command->create->children('urn:ietf:params:xml:ns:host-1.0')->create->name;
     $clTRID = (string) $xml->command->clTRID;
 
-    $hostName = strtoupper($hostName);
     if (preg_match('/^([A-Z0-9]([A-Z0-9-]{0,61}[A-Z0-9]){0,1}\.){1,125}[A-Z0-9]([A-Z0-9-]{0,61}[A-Z0-9])$/i', $hostName) && strlen($hostName) < 254) {
         $host_id_already_exist = $db->query("SELECT id FROM host WHERE name = '$hostName' LIMIT 1")->fetchColumn();
         if ($host_id_already_exist) {
@@ -492,7 +491,7 @@ function processHostCreate($conn, $db, $xml, $clid, $database_type) {
         $stmt->execute([$hostName, $superordinate_dom, $clid, $clid]);
         $host_id = $db->lastInsertId();
         
-        $host_addr_list = $xml->xpath('host:addr');
+        $host_addr_list = $xml->xpath('//host:addr');
         
         foreach ($host_addr_list as $node) {
             $addr = (string) $node;
@@ -504,11 +503,13 @@ function processHostCreate($conn, $db, $xml, $clid, $database_type) {
                 $addr = normalize_v4_address($addr);
             }
             
-            $addr_type = ($addr_type == 'v6') ? 6 : 4;
-            
             $stmt = $db->prepare("INSERT INTO host_addr (host_id,addr,ip) VALUES(?,?,?)");
             $stmt->execute([$host_id, $addr, $addr_type]);
         }
+		
+        $host_status = 'ok';
+        $stmt = $db->prepare("INSERT INTO host_status (host_id,status) VALUES(?,?)");
+        $stmt->execute([$host_id, $host_status]);
 
         $stmt = $db->prepare("SELECT crdate FROM host WHERE name = ? LIMIT 1");
         $stmt->execute([$hostName]);
diff --git a/epp/src/epp-update.php b/epp/src/epp-update.php
index 8113a9c..f1fbb38 100644
--- a/epp/src/epp-update.php
+++ b/epp/src/epp-update.php
@@ -10,23 +10,23 @@ function processContactUpdate($conn, $db, $xml, $clid, $database_type) {
     $identicaUpdate = $xml->xpath('//identica:update') ?? null;
 
     if (!$contactRem && !$contactAdd && !$contactChg && !$identicaUpdate) {
-        sendEppError($conn, 2003, 'Required parameter missing');
+        sendEppError($conn, 2003, 'At least one contact:rem || contact:add || contact:chg', $clTRID);
         return;
     }
 
     if (!$contactID) {
-        sendEppError($conn, 2003, 'Required parameter missing');
+        sendEppError($conn, 2003, 'Contact identifier missing', $clTRID);
         return;
     }
 
-    $stmt = $db->prepare("SELECT `id`, `clid` FROM `contact` WHERE `identifier` = :identifier LIMIT 1");
+    $stmt = $db->prepare("SELECT id, clid FROM contact WHERE identifier = :identifier LIMIT 1");
     $stmt->execute([':identifier' => $contactID]);
     $row = $stmt->fetch(PDO::FETCH_ASSOC);
     $contact_id = $row['id'] ?? null;
     $registrar_id_contact = $row['clid'] ?? null;
 
     if (!$contact_id) {
-        sendEppError($conn, 2303, 'Object does not exist');
+        sendEppError($conn, 2303, 'Contact does not exist', $clTRID);
         return;
     }
     
@@ -37,30 +37,30 @@ function processContactUpdate($conn, $db, $xml, $clid, $database_type) {
     $clid = $clid['id'];
 
     if ($clid != $registrar_id_contact) {
-        sendEppError($conn, 2201, 'Authorization error');
+        sendEppError($conn, 2201, 'It belongs to another registrar', $clTRID);
         return;
     }
 
-    $stmt = $db->prepare("SELECT `status` FROM `contact_status` WHERE `contact_id` = :contact_id");
+    $stmt = $db->prepare("SELECT status FROM contact_status WHERE contact_id = :contact_id");
     $stmt->execute([':contact_id' => $contact_id]);
     while ($statusRow = $stmt->fetch(PDO::FETCH_ASSOC)) {
         $status = $statusRow['status'];
         if (preg_match('/.*(serverUpdateProhibited)$/', $status) || preg_match('/^pending/', $status)) {
-            sendEppError($conn, 2304, 'Object status prohibits operation');
+            sendEppError($conn, 2304, 'It has a serverUpdateProhibited or pendingUpdate status that does not allow modification', $clTRID);
             return;
         }
     }
 
     $clientUpdateProhibited = 0;
-    $stmt = $db->prepare("SELECT `id` FROM `contact_status` WHERE `contact_id` = :contact_id AND `status` = 'clientUpdateProhibited' LIMIT 1");
+    $stmt = $db->prepare("SELECT id FROM contact_status WHERE contact_id = :contact_id AND status = 'clientUpdateProhibited' LIMIT 1");
     $stmt->execute([':contact_id' => $contact_id]);
     $clientUpdateProhibited = $stmt->fetchColumn();
 
     if ($contactRem) {
-        $statusList = $xml->xpath('contact:status/@s', $contactRem);
+        $statusList = $xml->xpath('//contact:status/@s', $contactRem);
 
         if (count($statusList) == 0) {
-            sendEppError($conn, 2005, 'Parameter value syntax error');
+            sendEppError($conn, 2005, 'At least one status element MUST be present', $clTRID);
             return;
         }
 
@@ -70,39 +70,39 @@ function processContactUpdate($conn, $db, $xml, $clid, $database_type) {
                 $clientUpdateProhibited = 0;
             }
             if (!preg_match('/^(clientDeleteProhibited|clientTransferProhibited|clientUpdateProhibited)$/', $status)) {
-                sendEppError($conn, 2005, 'Parameter value syntax error');
+                sendEppError($conn, 2005, 'Only these clientDeleteProhibited|clientTransferProhibited|clientUpdateProhibited statuses are accepted', $clTRID);
                 return;
             }
         }
     }
 
     if ($clientUpdateProhibited) {
-        sendEppError($conn, 2304, 'Object status prohibits operation');
+        sendEppError($conn, 2304, 'It has clientUpdateProhibited status, but you did not indicate this status when deleting', $clTRID);
         return;
     }
 
     if ($contactAdd) {
-        $statusList = $xml->xpath('contact:status/@s', $contactAdd);
+        $statusList = $xml->xpath('//contact:status/@s', $contactAdd);
 
         if (count($statusList) == 0) {
-            sendEppError($conn, 2005, 'Parameter value syntax error');
+            sendEppError($conn, 2005, 'At least one status element MUST be present', $clTRID);
             return;
         }
 
         foreach ($statusList as $node) {
             $status = (string)$node;
             if (!preg_match('/^(clientDeleteProhibited|clientTransferProhibited|clientUpdateProhibited)$/', $status)) {
-                sendEppError($conn, 2005, 'Parameter value syntax error');
+                sendEppError($conn, 2005, 'Only these clientDeleteProhibited|clientTransferProhibited|clientUpdateProhibited statuses are accepted', $clTRID);
                 return;
             }
 
             if (count($xml->xpath('contact:status[@s="' . $status . '"]', $contactRem)) == 0) {
-                $stmt = $db->prepare("SELECT `id` FROM `contact_status` WHERE `contact_id` = :contact_id AND `status` = :status LIMIT 1");
+                $stmt = $db->prepare("SELECT id FROM contact_status WHERE contact_id = :contact_id AND status = :status LIMIT 1");
                 $stmt->execute([':contact_id' => $contact_id, ':status' => $status]);
                 $contactStatusId = $stmt->fetchColumn();
 
                 if ($contactStatusId) {
-                    sendEppError($conn, 2306, 'Parameter policy error');
+                    sendEppError($conn, 2306, 'This status '.$status.' already exists for this contact', $clTRID);
                     return;
                 }
             }
@@ -150,64 +150,64 @@ function processContactUpdate($conn, $db, $xml, $clid, $database_type) {
             $postalInfoIntCc   = (string) $postalInfoInt->children('urn:ietf:params:xml:ns:contact-1.0')->addr->cc;
 
             if (!$postalInfoIntName) {
-                sendEppError($conn, 2003, 'Missing contact:name');
+                sendEppError($conn, 2003, 'Missing contact:name', $clTRID);
                 return;
             }
 
             if (preg_match('/(^\-)|(^\,)|(^\.)|(\-\-)|(\,\,)|(\.\.)|(\-$)/', $postalInfoIntName) || !preg_match('/^[a-zA-Z0-9\-\&\,\.\/\s]{5,}$/', $postalInfoIntName)) {
-                sendEppError($conn, 2005, 'Invalid contact:name');
+                sendEppError($conn, 2005, 'Invalid contact:name', $clTRID);
                 return;
             }
 
             if ($postalInfoIntOrg) {
                 if (preg_match('/(^\-)|(^\,)|(^\.)|(\-\-)|(\,\,)|(\.\.)|(\-$)/', $postalInfoIntOrg) || !preg_match('/^[a-zA-Z0-9\-\&\,\.\/\s]{5,}$/', $postalInfoIntOrg)) {
-                    sendEppError($conn, 2005, 'Invalid contact:org');
+                    sendEppError($conn, 2005, 'Invalid contact:org', $clTRID);
                     return;
                 }
             }
 
             if ($postalInfoIntStreet1) {
                 if (preg_match('/(^\-)|(^\,)|(^\.)|(\-\-)|(\,\,)|(\.\.)|(\-$)/', $postalInfoIntStreet1) || !preg_match('/^[a-zA-Z0-9\-\&\,\.\/\s]{5,}$/', $postalInfoIntStreet1)) {
-                    sendEppError($conn, 2005, 'Invalid contact:street');
+                    sendEppError($conn, 2005, 'Invalid contact:street', $clTRID);
                     return;
                 }
             }
 
             if ($postalInfoIntStreet2) {
                 if (preg_match('/(^\-)|(^\,)|(^\.)|(\-\-)|(\,\,)|(\.\.)|(\-$)/', $postalInfoIntStreet2) || !preg_match('/^[a-zA-Z0-9\-\&\,\.\/\s]{5,}$/', $postalInfoIntStreet2)) {
-                    sendEppError($conn, 2005, 'Invalid contact:street');
+                    sendEppError($conn, 2005, 'Invalid contact:street', $clTRID);
                     return;
                 }
             }
 
             if ($postalInfoIntStreet3) {
                 if (preg_match('/(^\-)|(^\,)|(^\.)|(\-\-)|(\,\,)|(\.\.)|(\-$)/', $postalInfoIntStreet3) || !preg_match('/^[a-zA-Z0-9\-\&\,\.\/\s]{5,}$/', $postalInfoIntStreet3)) {
-                    sendEppError($conn, 2005, 'Invalid contact:street');
+                    sendEppError($conn, 2005, 'Invalid contact:street', $clTRID);
                     return;
                 }
             }
 
             if (preg_match('/(^\-)|(^\.)|(\-\-)|(\.\.)|(\.\-)|(\-\.)|(\-$)|(\.$)/', $postalInfoIntCity) || !preg_match('/^[a-z][a-z\-\.\s]{3,}$/i', $postalInfoIntCity)) {
-                sendEppError($conn, 2005, 'Invalid contact:city');
+                sendEppError($conn, 2005, 'Invalid contact:city', $clTRID);
                 return;
             }
 
             if ($postalInfoIntSp) {
                 if (preg_match('/(^\-)|(^\.)|(\-\-)|(\.\.)|(\.\-)|(\-\.)|(\-$)|(\.$)/', $postalInfoIntSp) || !preg_match('/^[A-Z][a-zA-Z\-\.\s]{1,}$/', $postalInfoIntSp)) {
-                    sendEppError($conn, 2005, 'Invalid contact:sp');
+                    sendEppError($conn, 2005, 'Invalid contact:sp', $clTRID);
                     return;
                 }
             }
 
             if ($postalInfoIntPc) {
                 if (preg_match('/(^\-)|(\-\-)|(\-$)/', $postalInfoIntPc) || !preg_match('/^[A-Z0-9\-\s]{3,}$/', $postalInfoIntPc)) {
-                    sendEppError($conn, 2005, 'Invalid contact:pc');
+                    sendEppError($conn, 2005, 'Invalid contact:pc', $clTRID);
                     return;
                 }
             }
 
             if (!preg_match('/^(AF|AX|AL|DZ|AS|AD|AO|AI|AQ|AG|AR|AM|AW|AU|AT|AZ|BS|BH|BD|BB|BY|BE|BZ|BJ|BM|BT|BO|BQ|BA|BW|BV|BR|IO|BN|BG|BF|BI|KH|CM|CA|CV|KY|CF|TD|CL|CN|CX|CC|CO|KM|CG|CD|CK|CR|CI|HR|CU|CW|CY|CZ|DK|DJ|DM|DO|EC|EG|SV|GQ|ER|EE|ET|FK|FO|FJ|FI|FR|GF|PF|TF|GA|GM|GE|DE|GH|GI|GR|GL|GD|GP|GU|GT|GG|GN|GW|GY|HT|HM|VA|HN|HK|HU|IS|IN|ID|IR|IQ|IE|IM|IL|IT|JM|JP|JE|JO|KZ|KE|KI|KP|KR|KW|KG|LA|LV|LB|LS|LR|LY|LI|LT|LU|MO|MK|MG|MW|MY|MV|ML|MT|MH|MQ|MR|MU|YT|MX|FM|MD|MC|MN|ME|MS|MA|MZ|MM|NA|NR|NP|NL|NC|NZ|NI|NE|NG|NU|NF|MP|NO|OM|PK|PW|PS|PA|PG|PY|PE|PH|PN|PL|PT|PR|QA|RE|RO|RU|RW|BL|SH|KN|LC|MF|PM|VC|WS|SM|ST|SA|SN|RS|SC|SL|SG|SX|SK|SI|SB|SO|ZA|GS|ES|LK|SD|SR|SJ|SZ|SE|CH|SY|TW|TJ|TZ|TH|TL|TG|TK|TO|TT|TN|TR|TM|TC|TV|UG|UA|AE|GB|US|UM|UY|UZ|VU|VE|VN|VG|VI|WF|EH|YE|ZM|ZW)$/', $postalInfoIntCc)) {
-                sendEppError($conn, 2005, 'Invalid contact:cc');
+                sendEppError($conn, 2005, 'Invalid contact:cc', $clTRID);
                 return;
             }
         }
@@ -233,64 +233,64 @@ function processContactUpdate($conn, $db, $xml, $clid, $database_type) {
             $postalInfoLocCc   = (string) $postalInfoLoc->children('urn:ietf:params:xml:ns:contact-1.0')->addr->cc;
 
             if (!$postalInfoLocName) {
-                sendEppError($conn, 2003, 'Missing contact:name');
+                sendEppError($conn, 2003, 'Missing contact:name', $clTRID);
                 return;
             }
 
             if (preg_match('/(^\-)|(^\,)|(^\.)|(\-\-)|(\,\,)|(\.\.)|(\-$)/', $postalInfoLocName) || !preg_match('/^[a-zA-Z0-9\-\&\,\.\/\s]{5,}$/', $postalInfoLocName)) {
-                sendEppError($conn, 2005, 'Invalid contact:name');
+                sendEppError($conn, 2005, 'Invalid contact:name', $clTRID);
                 return;
             }
 
             if ($postalInfoLocOrg) {
                 if (preg_match('/(^\-)|(^\,)|(^\.)|(\-\-)|(\,\,)|(\.\.)|(\-$)/', $postalInfoLocOrg) || !preg_match('/^[a-zA-Z0-9\-\&\,\.\/\s]{5,}$/', $postalInfoLocOrg)) {
-                    sendEppError($conn, 2005, 'Invalid contact:org');
+                    sendEppError($conn, 2005, 'Invalid contact:org', $clTRID);
                     return;
                 }
             }
 
             if ($postalInfoLocStreet1) {
                 if (preg_match('/(^\-)|(^\,)|(^\.)|(\-\-)|(\,\,)|(\.\.)|(\-$)/', $postalInfoLocStreet1) || !preg_match('/^[a-zA-Z0-9\-\&\,\.\/\s]{5,}$/', $postalInfoLocStreet1)) {
-                    sendEppError($conn, 2005, 'Invalid contact:street');
+                    sendEppError($conn, 2005, 'Invalid contact:street', $clTRID);
                     return;
                 }
             }
 
             if ($postalInfoLocStreet2) {
                 if (preg_match('/(^\-)|(^\,)|(^\.)|(\-\-)|(\,\,)|(\.\.)|(\-$)/', $postalInfoLocStreet2) || !preg_match('/^[a-zA-Z0-9\-\&\,\.\/\s]{5,}$/', $postalInfoLocStreet2)) {
-                    sendEppError($conn, 2005, 'Invalid contact:street');
+                    sendEppError($conn, 2005, 'Invalid contact:street', $clTRID);
                     return;
                 }
             }
 
             if ($postalInfoLocStreet3) {
                 if (preg_match('/(^\-)|(^\,)|(^\.)|(\-\-)|(\,\,)|(\.\.)|(\-$)/', $postalInfoLocStreet3) || !preg_match('/^[a-zA-Z0-9\-\&\,\.\/\s]{5,}$/', $postalInfoLocStreet3)) {
-                    sendEppError($conn, 2005, 'Invalid contact:street');
+                    sendEppError($conn, 2005, 'Invalid contact:street', $clTRID);
                     return;
                 }
             }
 
             if (preg_match('/(^\-)|(^\.)|(\-\-)|(\.\.)|(\.\-)|(\-\.)|(\-$)|(\.$)/', $postalInfoLocCity) || !preg_match('/^[a-z][a-z\-\.\s]{3,}$/i', $postalInfoLocCity)) {
-                sendEppError($conn, 2005, 'Invalid contact:city');
+                sendEppError($conn, 2005, 'Invalid contact:city', $clTRID);
                 return;
             }
 
             if ($postalInfoLocSp) {
                 if (preg_match('/(^\-)|(^\.)|(\-\-)|(\.\.)|(\.\-)|(\-\.)|(\-$)|(\.$)/', $postalInfoLocSp) || !preg_match('/^[A-Z][a-zA-Z\-\.\s]{1,}$/', $postalInfoLocSp)) {
-                    sendEppError($conn, 2005, 'Invalid contact:sp');
+                    sendEppError($conn, 2005, 'Invalid contact:sp', $clTRID);
                     return;
                 }
             }
 
             if ($postalInfoLocPc) {
                 if (preg_match('/(^\-)|(\-\-)|(\-$)/', $postalInfoLocPc) || !preg_match('/^[A-Z0-9\-\s]{3,}$/', $postalInfoLocPc)) {
-                    sendEppError($conn, 2005, 'Invalid contact:pc');
+                    sendEppError($conn, 2005, 'Invalid contact:pc', $clTRID);
                     return;
                 }
             }
 
             if (!preg_match('/^(AF|AX|AL|DZ|AS|AD|AO|AI|AQ|AG|AR|AM|AW|AU|AT|AZ|BS|BH|BD|BB|BY|BE|BZ|BJ|BM|BT|BO|BQ|BA|BW|BV|BR|IO|BN|BG|BF|BI|KH|CM|CA|CV|KY|CF|TD|CL|CN|CX|CC|CO|KM|CG|CD|CK|CR|CI|HR|CU|CW|CY|CZ|DK|DJ|DM|DO|EC|EG|SV|GQ|ER|EE|ET|FK|FO|FJ|FI|FR|GF|PF|TF|GA|GM|GE|DE|GH|GI|GR|GL|GD|GP|GU|GT|GG|GN|GW|GY|HT|HM|VA|HN|HK|HU|IS|IN|ID|IR|IQ|IE|IM|IL|IT|JM|JP|JE|JO|KZ|KE|KI|KP|KR|KW|KG|LA|LV|LB|LS|LR|LY|LI|LT|LU|MO|MK|MG|MW|MY|MV|ML|MT|MH|MQ|MR|MU|YT|MX|FM|MD|MC|MN|ME|MS|MA|MZ|MM|NA|NR|NP|NL|NC|NZ|NI|NE|NG|NU|NF|MP|NO|OM|PK|PW|PS|PA|PG|PY|PE|PH|PN|PL|PT|PR|QA|RE|RO|RU|RW|BL|SH|KN|LC|MF|PM|VC|WS|SM|ST|SA|SN|RS|SC|SL|SG|SX|SK|SI|SB|SO|ZA|GS|ES|LK|SD|SR|SJ|SZ|SE|CH|SY|TW|TJ|TZ|TH|TL|TG|TK|TO|TT|TN|TR|TM|TC|TV|UG|UA|AE|GB|US|UM|UY|UZ|VU|VE|VN|VG|VI|WF|EH|YE|ZM|ZW)$/', $postalInfoLocCc)) {
-                sendEppError($conn, 2005, 'Invalid contact:cc');
+                sendEppError($conn, 2005, 'Invalid contact:cc', $clTRID);
                 return;
             }
         }
@@ -300,7 +300,7 @@ function processContactUpdate($conn, $db, $xml, $clid, $database_type) {
         $voice = (string) $contactUpdate->chg->voice;
         $voice_x = '';
         if ($voice && (!preg_match('/^\+\d{1,3}\.\d{1,14}$/', $voice) || strlen($voice) > 17)) {
-            sendEppError($conn, 2005, 'Voice must be (\+[0-9]{1,3}\.[0-9]{1,14})');
+            sendEppError($conn, 2005, 'Voice must be (\+[0-9]{1,3}\.[0-9]{1,14})', $clTRID);
             return;
         }
 
@@ -310,30 +310,30 @@ function processContactUpdate($conn, $db, $xml, $clid, $database_type) {
             $fax_x = (string) $contactUpdate->chg->fax->attributes()->x;
         }
         if ($fax && (!preg_match('/^\+\d{1,3}\.\d{1,14}$/', $fax) || strlen($fax) > 17)) {
-            sendEppError($conn, 2005, 'Fax must be (\+[0-9]{1,3}\.[0-9]{1,14})');
+            sendEppError($conn, 2005, 'Fax must be (\+[0-9]{1,3}\.[0-9]{1,14})', $clTRID);
             return;
         }
 
         $email = (string) $contactUpdate->chg->email;
         if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
-            sendEppError($conn, 2005, 'Email address failed check');
+            sendEppError($conn, 2005, 'Email address failed check', $clTRID);
             return;
         }
 
         $authInfo_pw = (string) $contactUpdate->chg->authInfo->pw;
         if ($authInfo_pw) {
             if ((strlen($authInfo_pw) < 6) || (strlen($authInfo_pw) > 16)) {
-                sendEppError($conn, 2005, 'Password needs to be at least 6 and up to 16 characters long');
+                sendEppError($conn, 2005, 'Password needs to be at least 6 and up to 16 characters long', $clTRID);
                 return;
             }
 
             if (!preg_match('/[A-Z]/', $authInfo_pw)) {
-                sendEppError($conn, 2005, 'Password should have both upper and lower case characters');
+                sendEppError($conn, 2005, 'Password should have both upper and lower case characters', $clTRID);
                 return;
             }
 
             if (!preg_match('/\d/', $authInfo_pw)) {
-                sendEppError($conn, 2005, 'Password should contain one or more numbers');
+                sendEppError($conn, 2005, 'Password should contain one or more numbers', $clTRID);
                 return;
             }
         }
@@ -396,12 +396,12 @@ function processContactUpdate($conn, $db, $xml, $clid, $database_type) {
         $nin_type = (string)$identica_update->xpath('//identica:nin/@type[1]')[0];
 
         if (!preg_match('/\d/', $nin)) {
-            sendEppError($conn, 2005, 'Parameter value syntax error');
+            sendEppError($conn, 2005, 'NIN should contain one or more numbers', $clTRID);
             return;
         }
 
         if (!in_array($nin_type, ['personal', 'business'])) {
-            sendEppError($conn, 2005, 'Parameter value syntax error');
+            sendEppError($conn, 2005, 'NIN Type should contain personal or business', $clTRID);
             return;
         }
     }
@@ -411,7 +411,7 @@ function processContactUpdate($conn, $db, $xml, $clid, $database_type) {
 
         foreach ($status_list as $node) {
             $status = (string)$node;
-            $sth = $db->prepare("DELETE FROM `contact_status` WHERE `contact_id` = ? AND `status` = ?");
+            $sth = $db->prepare("DELETE FROM contact_status WHERE contact_id = ? AND status = ?");
             $sth->execute([$contact_id, $status]);
         }
     }
@@ -421,13 +421,17 @@ function processContactUpdate($conn, $db, $xml, $clid, $database_type) {
 
         foreach ($status_list as $node) {
             $status = (string)$node;
-            $sth = $db->prepare("INSERT INTO `contact_status` (`contact_id`,`status`) VALUES(?,?)");
+            $sth = $db->prepare("INSERT INTO contact_status (contact_id,status) VALUES(?,?)");
             $sth->execute([$contact_id, $status]);
         }
     }
 
     if ($contactChg) {
-    $stmt = $db->prepare("SELECT `voice`,`voice_x`,`fax`,`fax_x`,`email`,`clid`,`crid`,`crdate`,`upid`,`update`,`trdate`,`trstatus`,`reid`,`redate`,`acid`,`acdate`,`disclose_voice`,`disclose_fax`,`disclose_email` FROM `contact` WHERE `id` = :contact_id LIMIT 1");
+    if ($database_type == 'mysql') {
+        $stmt = $db->prepare("SELECT `voice`, `voice_x`, `fax`, `fax_x`, `email`, `clid`, `crid`, `crdate`, `upid`, `update`, `trdate`, `trstatus`, `reid`, `redate`, `acid`, `acdate`, `disclose_voice`, `disclose_fax`, `disclose_email` FROM `contact` WHERE `id` = :contact_id LIMIT 1");
+    } else if ($database_type == 'pgsql') {
+        $stmt = $db->prepare("SELECT \"voice\", \"voice_x\", \"fax\", \"fax_x\", \"email\", \"clid\", \"crid\", \"crdate\", \"upid\", \"update\", \"trdate\", \"trstatus\", \"reid\", \"redate\", \"acid\", \"acdate\", \"disclose_voice\", \"disclose_fax\", \"disclose_email\" FROM \"contact\" WHERE \"id\" = :contact_id LIMIT 1");
+    } 
     $stmt->bindParam(':contact_id', $contact_id, PDO::PARAM_INT);
     $stmt->execute();
     $row = $stmt->fetch(PDO::FETCH_ASSOC);
@@ -435,7 +439,7 @@ function processContactUpdate($conn, $db, $xml, $clid, $database_type) {
 
     if ($postalInfoInt) {
         // For `contact_postalInfo` table with `type` = 'int'
-        $stmt_int = $db->prepare("SELECT `name`,`org`,`street1`,`street2`,`street3`,`city`,`sp`,`pc`,`cc`,`disclose_name_int`,`disclose_org_int`,`disclose_addr_int` FROM `contact_postalInfo` WHERE `contact_id` = :contact_id AND `type` = 'int' LIMIT 1");
+        $stmt_int = $db->prepare("SELECT name,org,street1,street2,street3,city,sp,pc,cc,disclose_name_int,disclose_org_int,disclose_addr_int FROM contact_postalInfo WHERE contact_id = :contact_id AND type = 'int' LIMIT 1");
         $stmt_int->bindParam(':contact_id', $contact_id, PDO::PARAM_INT);
         $stmt_int->execute();
         $row_int = $stmt_int->fetch(PDO::FETCH_ASSOC);
@@ -444,7 +448,7 @@ function processContactUpdate($conn, $db, $xml, $clid, $database_type) {
 
     if ($postalInfoLoc) {
         // For `contact_postalInfo` table with `type` = 'loc'
-        $stmt_loc = $db->prepare("SELECT `name`,`org`,`street1`,`street2`,`street3`,`city`,`sp`,`pc`,`cc`,`disclose_name_loc`,`disclose_org_loc`,`disclose_addr_loc` FROM `contact_postalInfo` WHERE `contact_id` = :contact_id AND `type` = 'loc' LIMIT 1");
+        $stmt_loc = $db->prepare("SELECT name,org,street1,street2,street3,city,sp,pc,cc,disclose_name_loc,disclose_org_loc,disclose_addr_loc FROM contact_postalInfo WHERE contact_id = :contact_id AND type = 'loc' LIMIT 1");
         $stmt_loc->bindParam(':contact_id', $contact_id, PDO::PARAM_INT);
         $stmt_loc->execute();
         $row_loc = $stmt_loc->fetch(PDO::FETCH_ASSOC);
@@ -452,13 +456,13 @@ function processContactUpdate($conn, $db, $xml, $clid, $database_type) {
     }
 
     // For `contact_authInfo` table with `authtype` = 'pw'
-    $stmt_pw = $db->prepare("SELECT `authinfo` FROM `contact_authInfo` WHERE `contact_id` = :contact_id AND `authtype` = 'pw' LIMIT 1");
+    $stmt_pw = $db->prepare("SELECT authinfo FROM contact_authInfo WHERE contact_id = :contact_id AND authtype = 'pw' LIMIT 1");
     $stmt_pw->bindParam(':contact_id', $contact_id, PDO::PARAM_INT);
     $stmt_pw->execute();
     $e_authInfo_pw = $stmt_pw->fetchColumn();
 
     // For `contact_authInfo` table with `authtype` = 'ext'
-    $stmt_ext = $db->prepare("SELECT `authinfo` FROM `contact_authInfo` WHERE `contact_id` = :contact_id AND `authtype` = 'ext' LIMIT 1");
+    $stmt_ext = $db->prepare("SELECT authinfo FROM contact_authInfo WHERE contact_id = :contact_id AND authtype = 'ext' LIMIT 1");
     $stmt_ext->bindParam(':contact_id', $contact_id, PDO::PARAM_INT);
     $stmt_ext->execute();
     $e_authInfo_ext = $stmt_ext->fetchColumn();
@@ -504,7 +508,11 @@ function processContactUpdate($conn, $db, $xml, $clid, $database_type) {
     $e_authInfo_ext = (string)($xml->xpath("//contact:authInfo/contact:ext")[0] ?? "");
 
     // Update contact
-    $query = "UPDATE `contact` SET `voice` = ?, `voice_x` = ?, `fax` = ?, `fax_x` = ?, `email` = ?, `update` = CURRENT_TIMESTAMP WHERE `id` = ?";
+    if ($database_type == 'mysql') {
+        $query = "UPDATE `contact` SET `voice` = ?, `voice_x` = ?, `fax` = ?, `fax_x` = ?, `email` = ?, `update` = CURRENT_TIMESTAMP WHERE `id` = ?";
+    } else if ($database_type == 'pgsql') {
+        $query = "UPDATE \"contact\" SET \"voice\" = ?, \"voice_x\" = ?, \"fax\" = ?, \"fax_x\" = ?, \"email\" = ?, \"update\" = timestamp 'now' WHERE \"id\" = ?";
+    }
     $stmt = $db->prepare($query);
     $stmt->execute([
         $e_voice ?: null,
@@ -517,7 +525,7 @@ function processContactUpdate($conn, $db, $xml, $clid, $database_type) {
 
     if ($postalInfoInt) {
         // Update contact_postalInfo for 'int'
-        $query = "UPDATE `contact_postalInfo` SET `name` = ?, `org` = ?, `street1` = ?, `street2` = ?, `street3` = ?, `city` = ?, `sp` = ?, `pc` = ?, `cc` = ? WHERE `contact_id` = ? AND `type` = ?";
+        $query = "UPDATE contact_postalInfo SET name = ?, org = ?, street1 = ?, street2 = ?, street3 = ?, city = ?, sp = ?, pc = ?, cc = ? WHERE contact_id = ? AND type = ?";
         $stmt = $db->prepare($query);
         $stmt->execute([
             $int_name,
@@ -553,7 +561,7 @@ function processContactUpdate($conn, $db, $xml, $clid, $database_type) {
     }
 
     // Update contact_authInfo for 'pw'
-    $query = "UPDATE `contact_authInfo` SET `authinfo` = ? WHERE `contact_id` = ? AND `authtype` = ?";
+    $query = "UPDATE contact_authInfo SET authinfo = ? WHERE contact_id = ? AND authtype = ?";
     $stmt = $db->prepare($query);
     $stmt->execute([
         $e_authInfo_pw,
@@ -572,11 +580,15 @@ function processContactUpdate($conn, $db, $xml, $clid, $database_type) {
     }
 
     if ($identica_update) {
-        $query = "UPDATE `contact` SET `nin` = ?, `nin_type` = ?, `update` = CURRENT_TIMESTAMP WHERE `id` = ?";
+        if ($database_type == 'mysql') {
+            $query = "UPDATE `contact` SET `nin` = ?, `nin_type` = ?, `update` = CURRENT_TIMESTAMP WHERE `id` = ?";
+        } else if ($database_type == 'pgsql') {
+            $query = "UPDATE \"contact\" SET \"nin\" = ?, \"nin_type\" = ?, \"update\" = timestamp 'now' WHERE \"id\" = ?";
+        }
         $stmt = $db->prepare($query);
 
         if (!$stmt) {
-            sendEppError($conn, 2400, 'Command failed');
+            sendEppError($conn, 2400, 'Database error', $clTRID);
             return;
         }
 
@@ -587,7 +599,7 @@ function processContactUpdate($conn, $db, $xml, $clid, $database_type) {
         ]);
 
         if (!$result) {
-            sendEppError($conn, 2400, 'Command failed');
+            sendEppError($conn, 2400, 'Database error', $clTRID);
             return;
         }
     }
@@ -601,6 +613,317 @@ function processContactUpdate($conn, $db, $xml, $clid, $database_type) {
         'svTRID' => generateSvTRID(),
     ];
 
+    $epp = new EPP\EppWriter();
+    $xml = $epp->epp_writer($response);
+    sendEppResponse($conn, $xml);
+}
+
+function processHostUpdate($conn, $db, $xml, $clid, $database_type) {
+    $name = (string) $xml->command->update->children('urn:ietf:params:xml:ns:host-1.0')->update->name;
+    $clTRID = (string) $xml->command->clTRID;
+    
+    $hostRem = $xml->xpath('//host:rem')[0] ?? null;
+    $hostAdd = $xml->xpath('//host:add')[0] ?? null;
+    $hostChg = $xml->xpath('//host:chg')[0] ?? null;
+
+    $extension = 0;
+    
+    if ($hostRem === null && $hostAdd === null && $hostChg === null) {
+        sendEppError($conn, 2003, 'At least one host:rem || host:add || host:chg MUST be provided', $clTRID);
+        return;
+    }
+
+    if (!$name) {
+        sendEppError($conn, 2003, 'The host being updated is not indicated', $clTRID);
+        return;
+    }
+
+    $name = strtoupper($name);
+
+    $stmt = $db->prepare("SELECT id, clid FROM host WHERE name = ? LIMIT 1");
+    $stmt->execute([$name]);
+
+    $row = $stmt->fetch(PDO::FETCH_ASSOC);
+    $hostId = $row['id'] ?? null;
+    $registrarIdHost = $row['clid'] ?? null;
+
+    if (!$hostId) {
+        sendEppError($conn, 2303, 'Host does not exist in registry', $clTRID);
+        return;
+    }
+    
+    $stmt = $db->prepare("SELECT id FROM registrar WHERE clid = :clid LIMIT 1");
+    $stmt->bindParam(':clid', $clid, PDO::PARAM_STR);
+    $stmt->execute();
+    $clid = $stmt->fetch(PDO::FETCH_ASSOC);
+    $clid = $clid['id'];
+
+    if ($clid !== $registrarIdHost) {
+        sendEppError($conn, 2201, 'Not registrar for host', $clTRID);
+        return;
+    }
+
+    $stmtStatus = $db->prepare("SELECT status FROM host_status WHERE host_id = ?");
+    $stmtStatus->execute([$hostId]);
+
+    while ($rowStatus = $stmtStatus->fetch(PDO::FETCH_ASSOC)) {
+        $status = $rowStatus['status'];
+        if (preg_match('/(serverUpdateProhibited)$/', $status) || preg_match('/^pending/', $status)) {
+            sendEppError($conn, 2304, 'It has a serverUpdateProhibited or pendingUpdate status that does not allow modification', $clTRID);
+            return;
+        }
+    }
+
+    $clientUpdateProhibited = 0;
+    $stmtClientUpdateProhibited = $db->prepare("SELECT id FROM host_status WHERE host_id = ? AND status = 'clientUpdateProhibited' LIMIT 1");
+    $stmtClientUpdateProhibited->execute([$hostId]);
+
+    $clientUpdateProhibited = $stmtClientUpdateProhibited->fetchColumn();
+
+    if (isset($hostRem)) {
+        $addrList = $xml->xpath('//host:rem/host:addr');
+        $statusList = $xml->xpath('//host:rem/host:status/@s');
+
+        if (count($addrList) == 0 && count($statusList) == 0) {
+            sendEppError($conn, 2005, 'At least one element MUST be present', $clTRID);
+            return;
+        }
+
+        foreach ($statusList as $node) {
+            $status = (string)$node;
+            if ($status === 'clientUpdateProhibited') {
+                $clientUpdateProhibited = 0;
+            }
+            if (!in_array($status, ['clientDeleteProhibited', 'clientUpdateProhibited'])) {
+                sendEppError($conn, 2005, 'Only these statuses clientDeleteProhibited|clientUpdateProhibited are accepted', $clTRID);
+                return;
+            }
+        }
+    }
+
+    if ($clientUpdateProhibited) {
+        sendEppError($conn, 2304, 'It has clientUpdateProhibited status, but you did not indicate this status when deleting', $clTRID);
+        return;
+    }
+
+    if (isset($hostAdd)) {
+        $addr_list = $xml->xpath('//host:add/host:addr');
+        $status_list = $xml->xpath('//host:add/host:status/@s');
+
+        if (count($addr_list) == 0 && count($status_list) == 0) {
+            sendEppError($conn, 2005, 'At least one element MUST be present', $clTRID);
+            return;
+        }
+
+        foreach ($status_list as $node) {
+            $status = (string) $node;
+            if (!preg_match('/^(clientDeleteProhibited|clientUpdateProhibited)$/', $status)) {
+                sendEppError($conn, 2005, 'Only these statuses clientDeleteProhibited|clientUpdateProhibited are accepted', $clTRID);
+                return;
+            }
+
+            if (count($xml->xpath('//host:add/host:status[@s="' . $status . '"]')) == 0) {
+                $stmt = $db->prepare("SELECT id FROM host_status WHERE host_id = ? AND status = ? LIMIT 1");
+                $stmt->execute([$hostId, $status]);
+                $contact_status_id = $stmt->fetchColumn();
+                if ($contact_status_id) {
+                    sendEppError($conn, 2306, 'This status '.$status.' already exists for this host', $clTRID);
+                    return;
+                }
+            }
+        }
+
+        foreach ($addr_list as $node) {
+            $addr = (string) $node;
+            $addr_type = $node->attributes()->ip ?? 'v4';
+
+            if ($addr_type == 'v6') {
+                // IPv6 validation and normalization
+                if (filter_var($addr, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+                    $addr = normalize_v6_address($addr);
+                    $stmt = $db->prepare("SELECT id FROM host_addr WHERE host_id = ? AND addr = ? AND ip = '6' LIMIT 1");
+                    $stmt->execute([$hostId, $addr]);
+                    $ipv6_addr_already_exists = $stmt->fetchColumn();
+                    if ($ipv6_addr_already_exists) {
+                        sendEppError($conn, 2306, 'This addr '.$addr.' already exists for this host', $clTRID);
+                        return;
+                    }
+                } else {
+                    // Invalid IPv6
+                    sendEppError($conn, 2005, 'Invalid host:addr v6', $clTRID);
+                    return;
+                }
+            } else {
+                // IPv4 validation and normalization
+                if (filter_var($addr, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+                    $addr = normalize_v4_address($addr);
+                    $stmt = $db->prepare("SELECT id FROM host_addr WHERE host_id = ? AND addr = ? AND ip = '4' LIMIT 1");
+                    $stmt->execute([$hostId, $addr]);
+                    $ipv4_addr_already_exists = $stmt->fetchColumn();
+                    if ($ipv4_addr_already_exists) {
+                        sendEppError($conn, 2306, 'This addr '.$addr.' already exists for this host', $clTRID);
+                        return;
+                    }
+                    if ($addr == '127.0.0.1') {
+                        sendEppError($conn, 2005, 'Invalid host:addr v4', $clTRID);
+                        return;
+                    }
+                } else {
+                    // Invalid IPv4
+                    sendEppError($conn, 2005, 'Invalid host:addr v4', $clTRID);
+                    return;
+                }
+            }
+        }
+    }
+
+    if (isset($hostChg)) {
+        $chg_name = $xml->xpath('//host:name[1]')[0];
+
+        $pattern = '/^([A-Z0-9]([A-Z0-9-]{0,61}[A-Z0-9]){0,1}\.){1,125}[A-Z0-9]([A-Z0-9-]{0,61}[A-Z0-9])$/i';
+
+        if (preg_match($pattern, $chg_name) && strlen($chg_name) < 254) {
+            $stmt = $db->prepare("SELECT id FROM host WHERE name = ? LIMIT 1");
+            $stmt->execute([$chg_name]);
+            $chg_name_id = $stmt->fetchColumn();
+
+            if ($chg_name_id) {
+                sendEppError($conn, 2306, 'If it already exists, then we can\'t change it', $clTRID);
+                return;
+            }
+        } else {
+            sendEppError($conn, 2005, 'Invalid host:name', $clTRID);
+            return;
+        }
+
+        $stmt = $db->prepare("SELECT domain_id FROM host WHERE name = ? LIMIT 1");
+        $stmt->execute([$name]);
+        $domain_id = $stmt->fetchColumn();
+
+        if ($domain_id) {
+            $stmt = $db->prepare("SELECT name FROM domain WHERE id = ? LIMIT 1");
+            $stmt->execute([$domain_id]);
+            $domain_name = $stmt->fetchColumn();
+
+            if (!stripos($chg_name, ".$domain_name")) {
+                sendEppError($conn, 2005, 'It must be a subdomain of '.$domain_name, $clTRID);
+                return;
+            }
+        } else {
+            $internal_host = 0;
+
+            $stmt = $db->prepare("SELECT tld FROM domain_tld");
+            $stmt->execute();
+            while ($row = $stmt->fetch()) {
+                $tld = strtoupper($row['tld']);
+                $tld = preg_quote($tld, '/');
+                if (preg_match("/$tld\$/i", $chg_name)) {
+                    $internal_host = 1;
+                    break;
+                }
+            }
+
+            if ($internal_host) {
+                sendEppError($conn, 2005, 'Must be external host', $clTRID);
+                return;
+            }
+        }
+
+        $stmt = $db->prepare("SELECT h.id FROM host AS h
+            INNER JOIN domain_host_map AS dhm ON (dhm.host_id = h.id)
+            INNER JOIN domain AS d ON (d.id = dhm.domain_id AND d.clid != h.clid)
+            WHERE h.id = ? AND h.domain_id IS NULL
+            LIMIT 1");
+        $stmt->execute([$hostId]);
+        $domain_host_map_id = $stmt->fetchColumn();
+
+        if ($domain_host_map_id) {
+            sendEppError($conn, 2305, 'It is not possible to modify because it is a dependency, it is used by some domain as NS', $clTRID);
+            return;
+        }
+    }
+
+    if (isset($hostRem)) {
+        $addr_list = $xml->xpath('//host:rem/host:addr');
+        $status_list = $xml->xpath('//host:rem/host:status/@s');
+
+        foreach ($addr_list as $node) {
+            $addr = (string) $node;
+            $addr_type = $node->attributes()['ip'] ? (string) $node->attributes()['ip'] : 'v4';
+            
+            $stmt = $db->prepare("DELETE FROM host_addr WHERE host_id = ? AND addr = ? AND ip = ?");
+            $stmt->execute([$hostId, $addr, $addr_type]);
+        }
+
+        foreach ($status_list as $node) {
+            $status = (string) $node;
+            
+            $stmt = $db->prepare("DELETE FROM host_status WHERE host_id = ? AND status = ?");
+            $stmt->execute([$hostId, $status]);
+        }
+    }
+
+    if (isset($hostAdd)) {
+        $addr_list = $xml->xpath('//host:add/host:addr');
+        $status_list = $xml->xpath('//host:add/host:status/@s');
+
+        foreach ($addr_list as $node) {
+            $addr = (string) $node;
+            $addr_type = $node->attributes()['ip'] ? (string) $node->attributes()['ip'] : 'v4';
+
+            // Normalize
+            if ($addr_type == 'v6') {
+                $addr = normalize_v6_address($addr);
+            } else {
+                $addr = normalize_v4_address($addr);
+            }
+
+        try {
+            $stmt = $db->prepare("INSERT INTO host_addr (host_id,addr,ip) VALUES(?,?,?)");
+            $stmt->execute([$hostId, $addr, $addr_type]);
+        } catch (PDOException $e) {
+            if ($database_type === 'mysql' && $e->errorInfo[1] == 1062) {
+                // Duplicate entry error for MySQL. Silently ignore.
+            } elseif ($database_type === 'pgsql' && $e->errorInfo[1] == 23505) {
+                // Duplicate entry error for PostgreSQL. Silently ignore.
+            } else {
+                sendEppError($conn, 2400, 'Database error', $clTRID);
+                return;
+            }
+        }
+
+        }
+
+        foreach ($status_list as $node) {
+            $status = (string) $node;
+
+            $stmt = $db->prepare("INSERT INTO host_status (host_id,status) VALUES(?,?)");
+            $stmt->execute([$hostId, $status]);
+        }
+    }
+
+    if (isset($hostChg)) {
+        $chg_name = strtoupper($xml->xpath('//host:name[1]')[0]);
+
+        if ($database_type == 'mysql') {
+            $query = "UPDATE `host` SET `name` = ?, `update` = CURRENT_TIMESTAMP WHERE `name` = ?";
+        } else if ($database_type == 'pgsql') {
+            $query = "UPDATE \"host\" SET \"name\" = ?, \"update\" = timestamp 'now' WHERE \"name\" = ?";
+        }
+
+        $stmt = $db->prepare($query);
+        $stmt->execute([$chg_name, $name]);
+    }
+
+    $response = [
+        'command' => 'update_host',
+        'resultCode' => 1000,
+        'lang' => 'en-US',
+        'message' => 'Command completed successfully',
+        'clTRID' => $clTRID,
+        'svTRID' => generateSvTRID(),
+    ];
+
     $epp = new EPP\EppWriter();
     $xml = $epp->epp_writer($response);
     sendEppResponse($conn, $xml);
diff --git a/epp/src/helpers.php b/epp/src/helpers.php
index 2af8bbd..251ef35 100644
--- a/epp/src/helpers.php
+++ b/epp/src/helpers.php
@@ -48,12 +48,16 @@ function sendGreeting($conn) {
     sendEppResponse($conn, $xml);
 }
 
-function sendEppError($conn, $code, $msg) {
+function sendEppError($conn, $code, $msg, $clTRID = "000") {
+    if (!isset($clTRID)) {
+        $clTRID = "000";
+    }
+	
     $response = [
         'command' => 'error',
         'resultCode' => $code,
-        'msg' => $msg,
-        'clTRID' => '1',
+        'human_readable_message' => $msg,
+        'clTRID' => $clTRID,
         'svTRID' => generateSvTRID(),
     ];
 
diff --git a/epp/start.php b/epp/start.php
index 9d53b46..9c7729a 100644
--- a/epp/start.php
+++ b/epp/start.php
@@ -291,6 +291,17 @@ $server->handle(function (Connection $conn) use ($table, $db, $c) {
                 processHostInfo($conn, $db, $xml);
                 break;
             }
+			
+            case isset($xml->command->update) && isset($xml->command->update->children('urn:ietf:params:xml:ns:host-1.0')->update):
+            {
+                $data = $table->get($connId);
+                if (!$data || $data['logged_in'] !== 1) {
+                    sendEppError($conn, 2202, 'Authorization error');
+                    $conn->close();
+                }
+                processHostUpdate($conn, $db, $xml, $data['clid'], $c['db_type']);
+                break;
+            }
             
             case isset($xml->command->delete) && isset($xml->command->delete->children('urn:ietf:params:xml:ns:host-1.0')->delete):
             {