diff --git a/src/Entity/HazMat.php b/src/Entity/HazMat.php
new file mode 100644
index 00000000..297c2b50
--- /dev/null
+++ b/src/Entity/HazMat.php
@@ -0,0 +1,631 @@
+<?php
+
+namespace Ups\Entity;
+
+use DOMDocument;
+use Ups\NodeInterface;
+
+/**
+ * Class Hazmat
+ * @package Ups\Entity
+ */
+class HazMat implements NodeInterface
+{
+
+    /**
+     * @var string
+     */
+    private $packagingTypeQuantity;
+
+    /**
+     * @var string
+     */
+    private $subRiskClass;
+
+    /**
+     * @var string
+     */
+    private $adrItemNumber;
+
+    /**
+     * @var string
+     */
+    private $adrPackingGroupLetter;
+
+    /**
+     * @var string
+     */
+    private $technicalName;
+
+    /**
+     * @var string
+     */
+    private $hazardLabelRequired;
+
+    /**
+     * @var string
+     */
+    private $classDivisionNumber;
+
+    /**
+     * @var string
+     */
+    private $referenceNumber;
+
+    /**
+     * @var string
+     */
+    private $quantity;
+
+    /**
+     * @var string
+     */
+    private $uom;
+
+    /**
+     * @var string
+     */
+    private $packagingType;
+
+    /**
+     * @var string
+     */
+    private $idNumber;
+
+    /**
+     * @var string
+     */
+    private $properShippingName;
+
+    /**
+     * @var string
+     */
+    private $additionalDescription;
+
+    /**
+     * @var string
+     */
+    private $packagingGroupType;
+
+    /**
+     * @var string
+     */
+    private $packagingInstructionCode;
+
+    /**
+     * @var string
+     */
+    private $emergencyPhone;
+
+    /**
+     * @var string
+     */
+    private $emergencyContact;
+
+    /**
+     * @var string
+     */
+    private $reportableQuantity;
+
+    /**
+     * @var string
+     */
+    private $regulationSet;
+
+    /**
+     * @var string
+     */
+    private $transportationMode;
+
+    /**
+     * @var string
+     */
+    private $commodityRegulatedLevelCode;
+
+    /**
+     * @var string
+     */
+    private $transportCategory;
+
+    /**
+     * @var string
+     */
+    private $tunnelRestrictionCode;
+
+    /**
+     * @var string
+     */
+    private $chemicalRecordIdentifier;
+
+    /**
+     * @param DOMDocument|null $document
+     * @return \DOMElement
+     */
+    public function toNode(DOMDocument $document = null)
+    {
+        if (null === $document) {
+            $document = new DOMDocument();
+        }
+
+        $node = $document->createElement('HazMat');
+
+
+        if ($this->getPackagingTypeQuantity()) {
+            $node->appendChild($document->createElement('PackagingTypeQuantity', $this->getPackagingTypeQuantity()));
+        }
+        if ($this->getSubRiskClass()) {
+            $node->appendChild($document->createElement('SubRiskClass', $this->getSubRiskClass()));
+        }
+        if ($this->getAdrItemNumber()) {
+            $node->appendChild($document->createElement('aDRItemNumber', $this->getAdrItemNumber()));
+        }
+        if ($this->getAdrPackingGroupLetter()) {
+            $node->appendChild($document->createElement('aDRPackingGroupLetter', $this->getAdrPackingGroupLetter()));
+        }
+        if ($this->getTechnicalName()) {
+            $node->appendChild($document->createElement('TechnicalName', $this->getTechnicalName()));
+        }
+        if ($this->getHazardLabelRequired()) {
+            $node->appendChild($document->createElement('HazardLabelRequired', $this->getHazardLabelRequired()));
+        }
+        if ($this->getReferenceNumber()) {
+            $node->appendChild($document->createElement('ReferenceNumber', $this->getReferenceNumber()));
+        }
+        if ($this->getQuantity()) {
+            $node->appendChild($document->createElement('Quantity', $this->getQuantity()));
+        }
+        if ($this->getClassDivisionNumber()) {
+            $node->appendChild($document->createElement('ClassDivisionNumber', $this->getClassDivisionNumber()));
+        }
+        if ($this->getUom()) {
+            $node->appendChild($document->createElement('UOM', $this->getUom()));
+        }
+        if ($this->getPackagingType()) {
+            $node->appendChild($document->createElement('PackagingType', $this->getPackagingType()));
+        }
+        if ($this->getIdNumber()) {
+            $node->appendChild($document->createElement('IDNumber', $this->getIdNumber()));
+        }
+        if ($this->getProperShippingName()) {
+            $node->appendChild($document->createElement('ProperShippingName', $this->getProperShippingName()));
+        }
+        if ($this->getAdditionalDescription()) {
+            $node->appendChild($document->createElement('AdditionalDescription', $this->getAdditionalDescription()));
+        }
+        if ($this->getPackagingGroupType()) {
+            $node->appendChild($document->createElement('PackagingGroupType', $this->getPackagingGroupType()));
+        }
+        if ($this->getPackagingInstructionCode()) {
+            $node->appendChild($document->createElement('PackagingInstructionCode', $this->getPackagingInstructionCode()));
+        }
+        if ($this->getEmergencyPhone()) {
+            $node->appendChild($document->createElement('EmergencyPhone', $this->getEmergencyPhone()));
+        }
+        if ($this->getEmergencyContact()) {
+            $node->appendChild($document->createElement('EmergencyContact', $this->getEmergencyContact()));
+        }
+        if ($this->getReportableQuantity()) {
+            $node->appendChild($document->createElement('ReportableQuantity', $this->getReportableQuantity()));
+        }
+        if ($this->getRegulationSet()) {
+            $node->appendChild($document->createElement('RegulationSet', $this->getRegulationSet()));
+        }
+        if ($this->getTransportationMode()) {
+            $node->appendChild($document->createElement('TransportationMode', $this->getTransportationMode()));
+        }
+        if ($this->getCommodityRegulatedLevelCode()) {
+            $node->appendChild($document->createElement('CommodityRegulatedLevelCode', $this->getCommodityRegulatedLevelCode()));
+        }
+        if ($this->getTransportCategory()) {
+            $node->appendChild($document->createElement('TransportCategory', $this->getTransportCategory()));
+        }
+        if ($this->getTunnelRestrictionCode()) {
+            $node->appendChild($document->createElement('TunnelRestrictionCode', $this->getTunnelRestrictionCode()));
+        }
+        if ($this->getChemicalRecordIdentifier()) {
+            $node->appendChild($document->createElement('ChemicalRecordIdentifier', $this->getChemicalRecordIdentifier()));
+        }
+
+        return $node;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPackagingTypeQuantity()
+    {
+        return $this->packagingTypeQuantity;
+    }
+
+    /**
+     * @param string $packagingTypeQuantity
+     */
+    public function setPackagingTypeQuantity($packagingTypeQuantity)
+    {
+        $this->packagingTypeQuantity = $packagingTypeQuantity;
+    }
+
+    /**
+     * @return string
+     */
+    public function getSubRiskClass()
+    {
+        return $this->subRiskClass;
+    }
+
+    /**
+     * @param string $subRiskClass
+     */
+    public function setSubRiskClass($subRiskClass)
+    {
+        $this->subRiskClass = $subRiskClass;
+    }
+
+    /**
+     * @return string
+     */
+    public function getAdrItemNumber()
+    {
+        return $this->adrItemNumber;
+    }
+
+    /**
+     * @param string $adrItemNumber
+     */
+    public function setAdrItemNumber($adrItemNumber)
+    {
+        $this->adrItemNumber = $adrItemNumber;
+    }
+
+    /**
+     * @return string
+     */
+    public function getAdrPackingGroupLetter()
+    {
+        return $this->adrPackingGroupLetter;
+    }
+
+    /**
+     * @param string $adrPackingGroupLetter
+     */
+    public function setAdrPackingGroupLetter($adrPackingGroupLetter)
+    {
+        $this->adrPackingGroupLetter = $adrPackingGroupLetter;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTechnicalName()
+    {
+        return $this->technicalName;
+    }
+
+    /**
+     * @param string $technicalName
+     */
+    public function setTechnicalName($technicalName)
+    {
+        $this->technicalName = $technicalName;
+    }
+
+    /**
+     * @return string
+     */
+    public function getHazardLabelRequired()
+    {
+        return $this->hazardLabelRequired;
+    }
+
+    /**
+     * @param string $hazardLabelRequired
+     */
+    public function setHazardLabelRequired($hazardLabelRequired)
+    {
+        $this->hazardLabelRequired = $hazardLabelRequired;
+    }
+
+    /**
+     * @return string
+     */
+    public function getClassDivisionNumber()
+    {
+        return $this->classDivisionNumber;
+    }
+
+    /**
+     * @param string $classDivisionNumber
+     */
+    public function setClassDivisionNumber($classDivisionNumber)
+    {
+        $this->classDivisionNumber = $classDivisionNumber;
+    }
+
+    /**
+     * @return string
+     */
+    public function getReferenceNumber()
+    {
+        return $this->referenceNumber;
+    }
+
+    /**
+     * @param string $referenceNumber
+     */
+    public function setReferenceNumber($referenceNumber)
+    {
+        $this->referenceNumber = $referenceNumber;
+    }
+
+    /**
+     * @return string
+     */
+    public function getQuantity()
+    {
+        return $this->quantity;
+    }
+
+    /**
+     * @param string $quantity
+     */
+    public function setQuantity($quantity)
+    {
+        $this->quantity = $quantity;
+    }
+
+    /**
+     * @return string
+     */
+    public function getUom()
+    {
+        return $this->uom;
+    }
+
+    /**
+     * @param string $uom
+     */
+    public function setUom($uom)
+    {
+        $this->uom = $uom;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPackagingType()
+    {
+        return $this->packagingType;
+    }
+
+    /**
+     * @param string $packagingType
+     */
+    public function setPackagingType($packagingType)
+    {
+        $this->packagingType = $packagingType;
+    }
+
+    /**
+     * @return string
+     */
+    public function getIdNumber()
+    {
+        return $this->idNumber;
+    }
+
+    /**
+     * @param string $idNumber
+     */
+    public function setIdNumber($idNumber)
+    {
+        $this->idNumber = $idNumber;
+    }
+
+    /**
+     * @return string
+     */
+    public function getProperShippingName()
+    {
+        return $this->properShippingName;
+    }
+
+    /**
+     * @param string $properShippingName
+     */
+    public function setProperShippingName($properShippingName)
+    {
+        $this->properShippingName = $properShippingName;
+    }
+
+    /**
+     * @return string
+     */
+    public function getAdditionalDescription()
+    {
+        return $this->additionalDescription;
+    }
+
+    /**
+     * @param string $additionalDescription
+     */
+    public function setAdditionalDescription($additionalDescription)
+    {
+        $this->additionalDescription = $additionalDescription;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPackagingGroupType()
+    {
+        return $this->packagingGroupType;
+    }
+
+    /**
+     * @param string $packagingGroupType
+     */
+    public function setPackagingGroupType($packagingGroupType)
+    {
+        $this->packagingGroupType = $packagingGroupType;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPackagingInstructionCode()
+    {
+        return $this->packagingInstructionCode;
+    }
+
+    /**
+     * @param string $packagingInstructionCode
+     */
+    public function setPackagingInstructionCode($packagingInstructionCode)
+    {
+        $this->packagingInstructionCode = $packagingInstructionCode;
+    }
+
+    /**
+     * @return string
+     */
+    public function getEmergencyPhone()
+    {
+        return $this->emergencyPhone;
+    }
+
+    /**
+     * @param string $emergencyPhone
+     */
+    public function setEmergencyPhone($emergencyPhone)
+    {
+        $this->emergencyPhone = $emergencyPhone;
+    }
+
+    /**
+     * @return string
+     */
+    public function getEmergencyContact()
+    {
+        return $this->emergencyContact;
+    }
+
+    /**
+     * @param string $emergencyContact
+     */
+    public function setEmergencyContact($emergencyContact)
+    {
+        $this->emergencyContact = $emergencyContact;
+    }
+
+    /**
+     * @return string
+     */
+    public function getReportableQuantity()
+    {
+        return $this->reportableQuantity;
+    }
+
+    /**
+     * @param string $reportableQuantity
+     */
+    public function setReportableQuantity($reportableQuantity)
+    {
+        $this->reportableQuantity = $reportableQuantity;
+    }
+
+    /**
+     * @return string
+     */
+    public function getRegulationSet()
+    {
+        return $this->regulationSet;
+    }
+
+    /**
+     * @param string $regulationSet
+     */
+    public function setRegulationSet($regulationSet)
+    {
+        $this->regulationSet = $regulationSet;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTransportationMode()
+    {
+        return $this->transportationMode;
+    }
+
+    /**
+     * @param string $transportationMode
+     */
+    public function setTransportationMode($transportationMode)
+    {
+        $this->transportationMode = $transportationMode;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCommodityRegulatedLevelCode()
+    {
+        return $this->commodityRegulatedLevelCode;
+    }
+
+    /**
+     * @param string $commodityRegulatedLevelCode
+     */
+    public function setCommodityRegulatedLevelCode($commodityRegulatedLevelCode)
+    {
+        $this->commodityRegulatedLevelCode = $commodityRegulatedLevelCode;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTransportCategory()
+    {
+        return $this->transportCategory;
+    }
+
+    /**
+     * @param string $transportCategory
+     */
+    public function setTransportCategory($transportCategory)
+    {
+        $this->transportCategory = $transportCategory;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTunnelRestrictionCode()
+    {
+        return $this->tunnelRestrictionCode;
+    }
+
+    /**
+     * @param string $tunnelRestrictionCode
+     */
+    public function setTunnelRestrictionCode($tunnelRestrictionCode)
+    {
+        $this->tunnelRestrictionCode = $tunnelRestrictionCode;
+    }
+
+    /**
+     * @return string
+     */
+    public function getChemicalRecordIdentifier()
+    {
+        return $this->chemicalRecordIdentifier;
+    }
+
+    /**
+     * @param string $chemicalRecordIdentifier
+     */
+    public function setChemicalRecordIdentifier($chemicalRecordIdentifier)
+    {
+        $this->chemicalRecordIdentifier = $chemicalRecordIdentifier;
+    }
+}
diff --git a/src/Entity/HazMatPackageInformation.php b/src/Entity/HazMatPackageInformation.php
new file mode 100644
index 00000000..15c32d8d
--- /dev/null
+++ b/src/Entity/HazMatPackageInformation.php
@@ -0,0 +1,104 @@
+<?php
+
+namespace Ups\Entity;
+
+use DOMDocument;
+use DOMElement;
+use Ups\NodeInterface;
+
+/**
+ * Class HazMatPackageInformation
+ * @package Ups\Entity
+ */
+class HazMatPackageInformation implements NodeInterface
+{
+
+    /**
+     * @var bool
+     */
+    private $allPackedInOneIndicator;
+
+    /**
+     * @var bool
+     */
+    private $overPackedIndicator;
+
+    /**
+     * @var string
+     */
+    private $qValue;
+
+    /**
+     * @param null|DOMDocument $document
+     *
+     * @return DOMElement
+     */
+    public function toNode(DOMDocument $document = null)
+    {
+        if (null === $document) {
+            $document = new DOMDocument();
+        }
+
+        $node = $document->createElement('HazMatPackageInformation');
+
+        if ($this->isAllPackedInOneIndicator()) {
+            $node->appendChild($document->createElement('AllPackedInOneIndicator'));
+        }
+        if ($this->isOverPackedIndicator()) {
+            $node->appendChild($document->createElement('OverPackedIndicator'));
+        }
+        if ($this->getQValue() !== null) {
+            $node->appendChild($document->createElement('QValue', $this->getQValue()));
+        }
+
+        return $node;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isAllPackedInOneIndicator()
+    {
+        return $this->allPackedInOneIndicator;
+    }
+
+    /**
+     * @param bool $allPackedInOneIndicator
+     */
+    public function setAllPackedInOneIndicator($allPackedInOneIndicator)
+    {
+        $this->allPackedInOneIndicator = $allPackedInOneIndicator;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isOverPackedIndicator()
+    {
+        return $this->overPackedIndicator;
+    }
+
+    /**
+     * @param bool $overPackedIndicator
+     */
+    public function setOverPackedIndicator($overPackedIndicator)
+    {
+        $this->overPackedIndicator = $overPackedIndicator;
+    }
+
+    /**
+     * @return string
+     */
+    public function getQValue()
+    {
+        return $this->qValue;
+    }
+
+    /**
+     * @param string $qValue
+     */
+    public function setQValue($qValue)
+    {
+        $this->qValue = $qValue;
+    }
+}
diff --git a/src/Entity/PackageServiceOptions.php b/src/Entity/PackageServiceOptions.php
index 67a0fd7d..ecaf294c 100644
--- a/src/Entity/PackageServiceOptions.php
+++ b/src/Entity/PackageServiceOptions.php
@@ -28,9 +28,14 @@ class PackageServiceOptions implements NodeInterface
     private $earliestDeliveryTime;
 
     /**
-     * @var string
+     * @var HazMat[]
+     */
+    private $hazMat = [];
+
+    /**
+     * @var HazMatPackageInformation
      */
-    private $hazardousMaterialsCode;
+    private $hazMatPackageInformation;
 
     /**
      * @var string
@@ -52,9 +57,6 @@ public function __construct($parameters = null)
             if (isset($parameters->EarliestDeliveryTime)) {
                 $this->setEarliestDeliveryTime($parameters->EarliestDeliveryTime);
             }
-            if (isset($parameters->HazardousMaterialsCode)) {
-                $this->setHazardousMaterialsCode($parameters->HazardousMaterialsCode);
-            }
             if (isset($parameters->HoldForPickup)) {
                 $this->setHoldForPickup($parameters->HoldForPickup);
             }
@@ -64,7 +66,7 @@ public function __construct($parameters = null)
     /**
      * @param null|DOMDocument $document
      *
-     * TODO: this seem to be awfully incomplete
+     * @TODO: this seem to be awfully incomplete
      *
      * @return DOMElement
      */
@@ -79,6 +81,12 @@ public function toNode(DOMDocument $document = null)
         if ($this->getInsuredValue()) {
             $node->appendChild($this->getInsuredValue()->toNode($document));
         }
+        foreach ($this->getHazMat() as $hazmat) {
+            $node->appendChild($hazmat->toNode($document));
+        }
+        if ($this->getHazMatPackageInformation() !== null) {
+            $node->appendChild($this->getHazMatPackageInformation()->toNode($document));
+        }
 
         return $node;
     }
@@ -132,19 +140,27 @@ public function setEarliestDeliveryTime($var)
     }
 
     /**
-     * @return string|null
+     * @return HazMat[]
      */
-    public function getHazardousMaterialsCode()
+    public function getHazMat()
     {
-        return $this->hazardousMaterialsCode;
+        return $this->hazMat;
     }
 
     /**
-     * @param $var
+     * @param HazMat[] $hazMat
+     */
+    public function setHazMat(array $hazMat)
+    {
+        $this->hazMat = $hazMat;
+    }
+
+    /**
+     * @param HazMat $hazmat
      */
-    public function setHazardousMaterialsCode($var)
+    public function addHazMat(HazMat $hazmat)
     {
-        $this->hazardousMaterialsCode = $var;
+        $this->hazMat[] = $hazmat;
     }
 
     /**
@@ -162,4 +178,20 @@ public function setHoldForPickup($var)
     {
         $this->holdForPickup = $var;
     }
+
+    /**
+     * @return HazMatPackageInformation
+     */
+    public function getHazMatPackageInformation()
+    {
+        return $this->hazMatPackageInformation;
+    }
+
+    /**
+     * @param HazMatPackageInformation $hazMatPackageInformation
+     */
+    public function setHazMatPackageInformation($hazMatPackageInformation)
+    {
+        $this->hazMatPackageInformation = $hazMatPackageInformation;
+    }
 }