diff --git a/openTRANS/ORDERRESPONSE/OrderResponse.cs b/openTRANS/ORDERRESPONSE/OrderResponse.cs
index 98790fc..bde00bc 100644
--- a/openTRANS/ORDERRESPONSE/OrderResponse.cs
+++ b/openTRANS/ORDERRESPONSE/OrderResponse.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Xml.Schema;
 using System.Xml.Serialization;
 
 namespace openTRANS
@@ -6,8 +7,11 @@ namespace openTRANS
     [XmlRoot("ORDERRESPONSE", Namespace = "http://www.opentrans.org/XMLSchema/2.1", IsNullable = false)]
     public partial class OrderResponse
     {
+        [XmlAttribute("schemaLocation", Namespace = XmlSchema.InstanceNamespace)]
+        public string xsiSchemaLocation => "http://www.opentrans.org/XMLSchema/2.1%20opentrans_2_1.xsd";
+
         [XmlAttribute("version")]
-        public string Version = "2.1";
+        public string Version => "2.1";
 
         [XmlElement("ORDERRESPONSE_HEADER")]
         public OrderResponseHeader OrderResponseHeader = new OrderResponseHeader();
diff --git a/openTRANS/ORDERRESPONSE/OrderResponseItem.cs b/openTRANS/ORDERRESPONSE/OrderResponseItem.cs
index d9fbe42..ef63a5a 100644
--- a/openTRANS/ORDERRESPONSE/OrderResponseItem.cs
+++ b/openTRANS/ORDERRESPONSE/OrderResponseItem.cs
@@ -2,8 +2,7 @@
 using System.Xml.Serialization;
 using static openTRANS.Common;
 
-namespace openTRANS
-{
+namespace openTRANS {
     public partial class OrderResponseItem
     {
         [XmlElement("LINE_ITEM_ID")]
@@ -21,14 +20,33 @@ public partial class OrderResponseItem
         [XmlElement("QUANTITY")]
         public int Quantity;
 
-        [XmlElement("ORDER_UNIT", Namespace = Common.Namespace.bmecat)]
+        [XmlElement("ORDER_UNIT", Namespace = Namespace.bmecat)]
         public string OrderUnit;
 
         [XmlElement("PRODUCT_PRICE_FIX")]
         public ProductPriceFix ProductPriceFix = new ProductPriceFix();
 
         [XmlElement("PRICE_LINE_AMOUNT")]
-        public decimal PriceLineAmount;
+        public decimal PriceLineAmount {
+            get => Quantity * ProductPriceFix.PriceAmount;
+            set { }
+        }
+
+        [XmlElement("DELIVERY_DATE")]
+        public DeliveryDate DeliveryDate { get; set; }
+
+        [XmlArray("PARTIAL_DELIVERY_LIST")]
+        [XmlArrayItem("PARTIAL_DELIVERY")]
+        public List<PartialDelivery> PartialDeliveryList { get; set; }
+
+        [XmlElement("SHIPMENT_PARTIES_REFERENCE")]
+        public ShipmentPartiesReference ShipmentPartiesReference { get; set; }
+
+        [XmlElement("SPECIAL_TREATMENT_CLASS")]
+        public string SpecialTreatmentClass { get; set; }
+
+        [XmlElement("MIME_INFO")]
+        public MimeInfo MimeInfo { get; set; }
 
         [XmlElement("REMARKS")]
         public List<TypedItem> Remarks = new List<TypedItem>();
diff --git a/openTRANS/SHARED/__delete_after_merging_pulls.cs b/openTRANS/SHARED/__delete_after_merging_pulls.cs
new file mode 100644
index 0000000..f11824f
--- /dev/null
+++ b/openTRANS/SHARED/__delete_after_merging_pulls.cs
@@ -0,0 +1,7 @@
+using System;
+
+namespace openTRANS {
+    [Obsolete("This class is implemented in one of the other pulls. Please merge first!", true)]
+    public class PartialDelivery {
+    }
+}
\ No newline at end of file