diff --git a/Digipost.Api.Client.ConcurrencyTest/DigipostRunner.cs b/Digipost.Api.Client.ConcurrencyTest/DigipostRunner.cs
index 2da177d7..e0d68389 100755
--- a/Digipost.Api.Client.ConcurrencyTest/DigipostRunner.cs
+++ b/Digipost.Api.Client.ConcurrencyTest/DigipostRunner.cs
@@ -50,11 +50,9 @@ public IMessage GetMessage()
             {
                 if (_message != null) return _message;
 
-                var primaryDocument = new Document("document subject", "txt", GetDocumentBytes());
-                var recipientByNameAndAddress = new RecipientByNameAndAddress("Ola Nordmann", "0460",
+                var primaryDocument = new Document("document subject", "txt", GetDocumentBytes());
+                var digitalRecipientWithFallbackPrint = new RecipientByNameAndAddress("Ola Nordmann", "0460",
                     "Oslo", "Collettsgate 68");
-
-                var digitalRecipientWithFallbackPrint = new Recipient(recipientByNameAndAddress);
                 _message = new Message(digitalRecipientWithFallbackPrint, primaryDocument);
             }
 
@@ -66,7 +64,7 @@ public IIdentification GetIdentification()
             lock (_lock)
             {
                 if (_identification != null) return _identification;
-                _identification = new Identification(IdentificationChoiceType.PersonalidentificationNumber, "01013300001");
+                _identification = new Identification(new RecipientById(IdentificationType.PersonalIdentificationNumber, "01013300001"));
             }
 
             return _identification;
diff --git a/Digipost.Api.Client.Domain/DataTransferObjects/IdentificationDataTransferObject.cs b/Digipost.Api.Client.Domain/DataTransferObjects/IdentificationDataTransferObject.cs
index 123180e6..bc64e6c1 100755
--- a/Digipost.Api.Client.Domain/DataTransferObjects/IdentificationDataTransferObject.cs
+++ b/Digipost.Api.Client.Domain/DataTransferObjects/IdentificationDataTransferObject.cs
@@ -32,9 +32,9 @@ public IdentificationDataTransferObject(IdentificationChoiceType identificationC
         /// <summary>
         /// Identify if recipient exists in Digipost by name and address.
         /// </summary>
-        public IdentificationDataTransferObject(RecipientByNameAndAddress recipientByNameAndAddress)
+        public IdentificationDataTransferObject(RecipientByNameAndAddressDataTranferObject recipientByNameAndAddressDataTranferObject)
         {
-            IdentificationValue = recipientByNameAndAddress;
+            IdentificationValue = recipientByNameAndAddressDataTranferObject;
             IdentificationType = IdentificationChoiceType.NameAndAddress;
         }
 
@@ -44,7 +44,7 @@ private IdentificationDataTransferObject()
         }
 
         [XmlElement("digipost-address", typeof (string))]
-        [XmlElement("name-and-address", typeof (RecipientByNameAndAddress))]
+        [XmlElement("name-and-address", typeof (RecipientByNameAndAddressDataTranferObject))]
         [XmlElement("organisation-number", typeof (string))]
         [XmlElement("personal-identification-number", typeof (string))]
         [XmlChoiceIdentifier("IdentificationType")]
diff --git a/Digipost.Api.Client.Domain/DataTransferObjects/MessageDataTransferObject.cs b/Digipost.Api.Client.Domain/DataTransferObjects/MessageDataTransferObject.cs
index 37ad7a09..a601b9e6 100755
--- a/Digipost.Api.Client.Domain/DataTransferObjects/MessageDataTransferObject.cs
+++ b/Digipost.Api.Client.Domain/DataTransferObjects/MessageDataTransferObject.cs
@@ -18,15 +18,15 @@ private MessageDataTransferObject()
             /**Must exist for serialization.**/
         }
 
-       public MessageDataTransferObject(RecipientDataTransferObject recipient, DocumentDataTransferObject primaryDocumentDataTransferObject)
+       public MessageDataTransferObject(RecipientDataTransferObject recipientDataTransferObject, DocumentDataTransferObject primaryDocumentDataTransferObject)
         {
-            Recipient = recipient;
+            RecipientDataTransferObject = recipientDataTransferObject;
             PrimaryDocumentDataTransferObject = primaryDocumentDataTransferObject;
             Attachments = new List<DocumentDataTransferObject>();
         }
 
-       public MessageDataTransferObject(RecipientDataTransferObject recipient, DocumentDataTransferObject primaryDocumentDataTransferObject, string senderId):
-            this(recipient, primaryDocumentDataTransferObject)
+       public MessageDataTransferObject(RecipientDataTransferObject recipientDataTransferObject, DocumentDataTransferObject primaryDocumentDataTransferObject, string senderId):
+            this(recipientDataTransferObject, primaryDocumentDataTransferObject)
         {
             SenderId = senderId;
         }
@@ -35,7 +35,7 @@ public MessageDataTransferObject(RecipientDataTransferObject recipient, Document
         public string SenderId { get; set; }
 
         [XmlElement("recipient")]
-        public RecipientDataTransferObject Recipient { get; set; }
+        public RecipientDataTransferObject RecipientDataTransferObject { get; set; }
 
         [XmlElement("delivery-time")]
         public DateTime? DeliveryTime { get; set; }
diff --git a/Digipost.Api.Client.Domain/DataTransferObjects/RecipientDataTransferObject.cs b/Digipost.Api.Client.Domain/DataTransferObjects/RecipientDataTransferObject.cs
index acc17244..67a4e81f 100755
--- a/Digipost.Api.Client.Domain/DataTransferObjects/RecipientDataTransferObject.cs
+++ b/Digipost.Api.Client.Domain/DataTransferObjects/RecipientDataTransferObject.cs
@@ -19,9 +19,9 @@ private RecipientDataTransferObject()
             /**Must exist for serialization.**/
         }
 
-        public RecipientDataTransferObject(RecipientByNameAndAddress recipientByNameAndAddress, PrintDetailsDataTransferObject printDetailsDataTransferObject = null)
+        public RecipientDataTransferObject(RecipientByNameAndAddressDataTranferObject recipientByNameAndAddressDataTranferObject, PrintDetailsDataTransferObject printDetailsDataTransferObject = null)
         {
-            IdentificationValue = recipientByNameAndAddress;
+            IdentificationValue = recipientByNameAndAddressDataTranferObject;
             IdentificationType = IdentificationChoiceType.NameAndAddress;
             PrintDetailsDataTransferObject = printDetailsDataTransferObject;
         }
@@ -39,7 +39,7 @@ public RecipientDataTransferObject(PrintDetailsDataTransferObject printDetailsDa
         }
 
         [XmlElement("digipost-address", typeof (string))]
-        [XmlElement("name-and-address", typeof (RecipientByNameAndAddress))]
+        [XmlElement("name-and-address", typeof (RecipientByNameAndAddressDataTranferObject))]
         [XmlElement("organisation-number", typeof (string))]
         [XmlElement("personal-identification-number", typeof (string))]
         [XmlChoiceIdentifier("IdentificationType")]
diff --git a/Digipost.Api.Client.Domain/Digipost.Api.Client.Domain.csproj b/Digipost.Api.Client.Domain/Digipost.Api.Client.Domain.csproj
index e4277f6b..16b96396 100755
--- a/Digipost.Api.Client.Domain/Digipost.Api.Client.Domain.csproj
+++ b/Digipost.Api.Client.Domain/Digipost.Api.Client.Domain.csproj
@@ -40,9 +40,6 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ApiClientShared">
-      <HintPath>..\packages\api-client-shared.1.0.5637.25994\lib\net45\ApiClientShared.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml" />
@@ -51,15 +48,17 @@
     <Compile Include="..\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="DigipostRecipient.cs" />
     <Compile Include="DataTransferObjects\MessageDeliveryResult.cs" />
     <Compile Include="Enums\IdentificationType.cs" />
-    <Compile Include="Identify\Identification.cs" />
+    <Compile Include="Extensions\IdentificationTypeExtensions.cs" />
     <Compile Include="Enums\IdentificationError.cs" />
-    <Compile Include="Identify\IdentificationById.cs" />
-    <Compile Include="Identify\IdentificationByNameAndAddress.cs" />
+    <Compile Include="Identify\Identification.cs" />
     <Compile Include="Identify\IdentificationResult.cs" />
     <Compile Include="Identify\IIdentification.cs" />
+    <Compile Include="Identify\IIdentificationRecipient.cs" />
     <Compile Include="Identify\IIdentificationResult.cs" />
+    <Compile Include="IDigipostRecipient.cs" />
     <Compile Include="IError.cs" />
     <Compile Include="Print\Address.cs" />
     <Compile Include="Print\ForeignAddress.cs" />
@@ -80,12 +79,12 @@
     <Compile Include="Search\ISearchDetailsResult.cs" />
     <Compile Include="Search\SearchDetails.cs" />
     <Compile Include="SendMessage\IMessageDeliveryResult.cs" />
-    <Compile Include="SendMessage\IRecipient.cs" />
     <Compile Include="SendMessage\Document.cs" />
     <Compile Include="SendMessage\IDocument.cs" />
     <Compile Include="SendMessage\IInvoice.cs" />
     <Compile Include="SendMessage\IMessage.cs" />
     <Compile Include="SendMessage\Invoice.cs" />
+    <Compile Include="SendMessage\IRecipientById.cs" />
     <Compile Include="SendMessage\IRecipientByNameAndAddress.cs" />
     <Compile Include="SendMessage\ISmsNotification.cs" />
     <Compile Include="SendMessage\Message.cs" />
@@ -125,17 +124,15 @@
     <Compile Include="DataTransferObjects\PrintReturnRecipientDataTransferObject.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Enums\SensitivityLevel.cs" />
-    <Compile Include="SendMessage\Recipient.cs" />
     <Compile Include="DataTransferObjects\RecipientDataTransferObject.cs" />
-    <Compile Include="SendMessage\RecipientByNameAndAddress.cs" />
+    <Compile Include="SendMessage\RecipientById.cs" />
+    <Compile Include="SendMessage\RecipientByNameAndAddressDataTranferObject.cs" />
     <Compile Include="DataTransferObjects\SmsNotificationDataTransferObject.cs" />
     <Compile Include="RequestContent.cs" />
+    <Compile Include="SendMessage\RecipientByNameAndAddress.cs" />
     <Compile Include="SendMessage\SmsNotification.cs" />
     <Compile Include="Utilities\DataTransferObjectConverter.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Digipost.Api.Client.Domain/DigipostRecipient.cs b/Digipost.Api.Client.Domain/DigipostRecipient.cs
new file mode 100755
index 00000000..e62406d6
--- /dev/null
+++ b/Digipost.Api.Client.Domain/DigipostRecipient.cs
@@ -0,0 +1,7 @@
+namespace Digipost.Api.Client.Domain
+{
+    public abstract class DigipostRecipient : IDigipostRecipient
+    {
+      
+    }
+}
diff --git a/Digipost.Api.Client.Domain/Enums/IdentificationChoiceType.cs b/Digipost.Api.Client.Domain/Enums/IdentificationChoiceType.cs
index b2f70d3d..c1b74759 100755
--- a/Digipost.Api.Client.Domain/Enums/IdentificationChoiceType.cs
+++ b/Digipost.Api.Client.Domain/Enums/IdentificationChoiceType.cs
@@ -3,7 +3,6 @@
 
 namespace Digipost.Api.Client.Domain.Enums
 {
-    [Obsolete("Use IdentificationChoice, as this will be hidden in future version.")] //Make enum DataTransferObject, as IdenticficationChoice is exposed out.
     [Serializable]
     [XmlType(Namespace = "http://api.digipost.no/schema/v6", IncludeInSchema = false)]
     public enum IdentificationChoiceType
diff --git a/Digipost.Api.Client.Domain/Extensions/IdentificationTypeExtensions.cs b/Digipost.Api.Client.Domain/Extensions/IdentificationTypeExtensions.cs
new file mode 100755
index 00000000..53d4b063
--- /dev/null
+++ b/Digipost.Api.Client.Domain/Extensions/IdentificationTypeExtensions.cs
@@ -0,0 +1,29 @@
+using System;
+using Digipost.Api.Client.Domain.Enums;
+
+namespace Digipost.Api.Client.Domain.Extensions
+{
+    public static class IdentificationTypeExtensions
+    {
+        internal static IdentificationChoiceType ToIdentificationChoiceType(this IdentificationType identificationType)
+        {
+            var identificationChoiceType = 
+                identificationType == IdentificationType.OrganizationNumber 
+                ? OrganizationEnumWithSpellingDifference() 
+                : ParseEnumIgnoreCasing(identificationType);
+
+            return identificationChoiceType;
+        }
+
+        private static IdentificationChoiceType ParseEnumIgnoreCasing(IdentificationType identificationType)
+        {
+            return (IdentificationChoiceType) Enum.Parse(typeof(IdentificationChoiceType), identificationType.ToString(), ignoreCase: true);
+        }
+
+        internal static IdentificationChoiceType OrganizationEnumWithSpellingDifference()
+        {
+            return IdentificationChoiceType.OrganisationNumber;
+        }
+
+    }
+}
diff --git a/Digipost.Api.Client.Domain/IDigipostRecipient.cs b/Digipost.Api.Client.Domain/IDigipostRecipient.cs
new file mode 100755
index 00000000..25c9a093
--- /dev/null
+++ b/Digipost.Api.Client.Domain/IDigipostRecipient.cs
@@ -0,0 +1,7 @@
+namespace Digipost.Api.Client.Domain
+{
+    public interface IDigipostRecipient
+    {
+
+    }
+}
\ No newline at end of file
diff --git a/Digipost.Api.Client.Domain/Identify/IIdentification.cs b/Digipost.Api.Client.Domain/Identify/IIdentification.cs
index b1049ec2..d04961bb 100755
--- a/Digipost.Api.Client.Domain/Identify/IIdentification.cs
+++ b/Digipost.Api.Client.Domain/Identify/IIdentification.cs
@@ -4,8 +4,7 @@ namespace Digipost.Api.Client.Domain.Identify
 {
     public interface IIdentification : IRequestContent
     {
-        object Data { get; }
-
-        IdentificationChoiceType IdentificationChoiceType { get; }
+        DigipostRecipient DigipostRecipient { get; set; }
+        
     }
 }
\ No newline at end of file
diff --git a/Digipost.Api.Client.Domain/Identify/IIdentificationRecipient.cs b/Digipost.Api.Client.Domain/Identify/IIdentificationRecipient.cs
new file mode 100755
index 00000000..cca01c13
--- /dev/null
+++ b/Digipost.Api.Client.Domain/Identify/IIdentificationRecipient.cs
@@ -0,0 +1,7 @@
+namespace Digipost.Api.Client.Domain.Identify
+{
+    public interface IIdentificationRecipient
+    {
+
+    }
+}
\ No newline at end of file
diff --git a/Digipost.Api.Client.Domain/Identify/Identification.cs b/Digipost.Api.Client.Domain/Identify/Identification.cs
index d3cd834d..11a06d02 100755
--- a/Digipost.Api.Client.Domain/Identify/Identification.cs
+++ b/Digipost.Api.Client.Domain/Identify/Identification.cs
@@ -1,33 +1,12 @@
-using System;
-using Digipost.Api.Client.Domain.Enums;
-using Digipost.Api.Client.Domain.SendMessage;
-
-namespace Digipost.Api.Client.Domain.Identify
+namespace Digipost.Api.Client.Domain.Identify
 {
-    [Obsolete("Use IdentificationByNameAndAddress or IdentificationById. Will be removed in future version.")]
     public class Identification : IIdentification
     {
-        public IdentificationChoiceType IdentificationChoiceType { get; set; }
-
-        public IdentificationType IdentificationType
-        {
-            get
-            {
-                throw new NotImplementedException("Use IdentificationByNameAndAddress or IdentificationById class, as this will be removed in future version.");
-            }
-        }
-
-        public Identification(IdentificationChoiceType identificationChoiceType, string value)
-        {
-            IdentificationChoiceType = identificationChoiceType;
-            Data = value;
-        }
+        public DigipostRecipient DigipostRecipient { get; set; }
 
-        public Identification(RecipientByNameAndAddress recipientByNameAndAddress)
+        public Identification(DigipostRecipient digipostRecipient)
         {
-            Data = recipientByNameAndAddress;
+            DigipostRecipient = digipostRecipient;
         }
-        
-        public object Data { get; internal set; }
     }
 }
diff --git a/Digipost.Api.Client.Domain/Identify/IdentificationById.cs b/Digipost.Api.Client.Domain/Identify/IdentificationById.cs
deleted file mode 100755
index ef134af6..00000000
--- a/Digipost.Api.Client.Domain/Identify/IdentificationById.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using Digipost.Api.Client.Domain.Enums;
-
-namespace Digipost.Api.Client.Domain.Identify
-{
-    public class IdentificationById : IIdentification
-    {
-        public IdentificationById(IdentificationType identificationType, string value)
-        {
-            IdentificationType = identificationType;
-            Value = value;
-        }
-
-        public IdentificationType IdentificationType { get; private set; }
-
-        public object Data
-        {
-            get { return Value; }
-        }
-
-        [Obsolete("Use IdentificationType instead. Will be removed in future versions" )]
-        public IdentificationChoiceType IdentificationChoiceType {
-            get
-            {
-                return ParseIdentificationChoiceToIdentificationChoiceType();
-            } 
-        }
-
-        internal IdentificationChoiceType ParseIdentificationChoiceToIdentificationChoiceType()
-        {
-            IdentificationChoiceType identificationChoiceType;
-
-            if (IdentificationType == IdentificationType.OrganizationNumber)
-            {
-                identificationChoiceType = OrganizationEnumWithSpellingDifference();
-            }
-            else
-            {
-                identificationChoiceType = (IdentificationChoiceType)
-                Enum.Parse(typeof(IdentificationChoiceType), IdentificationType.ToString(), ignoreCase: true);    
-            }
-            
-            return identificationChoiceType;
-        }
-
-        internal IdentificationChoiceType OrganizationEnumWithSpellingDifference()
-        {
-            return IdentificationChoiceType.OrganisationNumber;
-        }
-
-        public string Value { get; set; }
-    }
-}
diff --git a/Digipost.Api.Client.Domain/Identify/IdentificationByNameAndAddress.cs b/Digipost.Api.Client.Domain/Identify/IdentificationByNameAndAddress.cs
deleted file mode 100755
index 63e4a7b6..00000000
--- a/Digipost.Api.Client.Domain/Identify/IdentificationByNameAndAddress.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Digipost.Api.Client.Domain.Enums;
-using Digipost.Api.Client.Domain.SendMessage;
-
-namespace Digipost.Api.Client.Domain.Identify
-{
-    public class IdentificationByNameAndAddress : IIdentification
-    {
-        public IdentificationByNameAndAddress(RecipientByNameAndAddress recipientByNameAndAddress)
-        {
-            RecipientByNameAndAddress = recipientByNameAndAddress;
-        }
-
-        public RecipientByNameAndAddress RecipientByNameAndAddress { get; set; }
-
-        public IdentificationChoiceType IdentificationChoiceType
-        {
-            get { return IdentificationChoiceType.NameAndAddress; }
-        }
-
-        public object Data
-        {
-            get { return RecipientByNameAndAddress; }
-        }
-    }
-}
diff --git a/Digipost.Api.Client.Domain/Message/Message.cs b/Digipost.Api.Client.Domain/Message/Message.cs
deleted file mode 100755
index c6c5fe3f..00000000
--- a/Digipost.Api.Client.Domain/Message/Message.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using Digipost.Api.Client.Domain.Enums;
-
-namespace Digipost.Api.Client.Domain
-{
-    [Serializable]
-    [DebuggerStepThrough]
-    [DesignerCategory("code")]
-    [XmlType(TypeName = "message", Namespace = "http://api.digipost.no/schema/v6")]
-    [XmlRoot(Namespace = "http://api.digipost.no/schema/v6", IsNullable = false)]
-    public class Message : RequestContent
-    {
-        private Message()
-        {
-            /**Must exist for serialization.**/
-        }
-
-        /// <summary>
-        /// A message to be delivered to a Recipient. 
-        /// </summary>
-        /// <param name="recipient">The recipient recieving the message.</param>
-        /// <param name="primaryDocument">The primary document sent to the recipient.</param>
-        public Message(Recipient recipient, Document primaryDocument)
-        {
-            Recipient = recipient;
-            PrimaryDocument = primaryDocument;
-            Attachments = new List<Document>();
-        }
-
-        /// <summary>
-        /// A message to be delivered to a Recipient. 
-        /// </summary>
-        /// <param name="recipient">The recipient receiving the message.</param>
-        /// <param name="primaryDocument">The primary document sent to the recipient.</param>
-        /// <param name="senderId">The id of the sender, created by Digipost.  If you are delivering a 
-        /// message on behalf of an organization, and permission to do so is set, this is the parameter use. </param>
-        public Message(Recipient recipient, Document primaryDocument, string senderId):
-            this(recipient, primaryDocument)
-        {
-            SenderValue = senderId;
-            SenderType = SenderChoiceType.SenderId; 
-        }
-
-        /// <summary>
-        /// A message to be delivered to a Recipient. 
-        /// </summary>
-        /// <param name="recipient">The recipient receiving the message.</param>
-        /// <param name="primaryDocument">The primary document sent to the recipient.</param>
-        /// <param name="senderOrganization">The organization sending the message. If you are delivering a 
-        /// message on behalf of an organization, and permission to do so is set, this is the parameter to set.
-        /// </param>
-        public Message(Recipient recipient, Document primaryDocument, SenderOrganization senderOrganization)
-            : this(recipient, primaryDocument)
-        {
-            SenderValue = senderOrganization;
-            SenderType = SenderChoiceType.SenderOrganization;
-        }
-        
-        [XmlChoiceIdentifier("SenderType")]
-        [XmlElement("sender-id", typeof(string))]
-        [XmlElement("sender-organization", typeof(SenderOrganization))]
-        public object SenderValue { get; set; }
-
-        [XmlIgnore]
-        public SenderChoiceType SenderType { get; set; }
-
-        /// <summary>
-        /// The recipient receiving the message. 
-        /// </summary>
-        [XmlElement("recipient")]
-        public Recipient Recipient { get; set; }
-
-        /// <summary>
-        /// Optional. The time when the document will be made visible to the user. 
-        /// </summary>
-        [XmlElement("delivery-time")]
-        public DateTime? DeliveryTime { get; set; }
-        
-        /// <summary>
-        /// True if a delivery time is specified for the message. Otherwise false.
-        /// </summary>
-        [XmlIgnoreAttribute()]
-        public bool DeliveryTimeSpecified
-        {
-            get
-            {
-                return DeliveryTime != null;
-            }
-        }
-        
-        /// <summary>
-        /// The primary document of the delivery. This is the document that will be shown first in the 
-        /// recipient's inbox when opening the letter.
-        /// </summary>
-        [XmlElement("primary-document")]
-        public Document PrimaryDocument { get; set; }
-
-        /// <summary>
-        /// Optional. Attachments can be added to the message, and can be of same types as the primary
-        /// document.
-        /// </summary>
-        [XmlElement("attachment")]
-        public List<Document> Attachments { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Digipost.Api.Client.Domain/SendMessage/IMessage.cs b/Digipost.Api.Client.Domain/SendMessage/IMessage.cs
index 56cebbde..9e876701 100755
--- a/Digipost.Api.Client.Domain/SendMessage/IMessage.cs
+++ b/Digipost.Api.Client.Domain/SendMessage/IMessage.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Digipost.Api.Client.Domain.Print;
 
 namespace Digipost.Api.Client.Domain.SendMessage
 {
@@ -8,7 +9,7 @@ public interface IMessage : IRequestContent
         /// <summary>
         /// The recipient receiving the message. 
         /// </summary>
-        IRecipient Recipient { get; set; }
+        IDigipostRecipient DigipostRecipient { get; set; }
 
         /// <summary>
         /// Optional. The time when the document will be made visible to the user. 
@@ -37,5 +38,12 @@ public interface IMessage : IRequestContent
         /// message on behalf of an organization, and permission to do so is set, this is the parameter to set.
         /// </summary>
         string SenderId { get; set; }
+
+        /// <summary>
+        /// Specifies fallback to print for the current message. If the message is not sent by Digipost, 
+        /// then fallback to print will start.
+        /// </summary>
+        IPrintDetails PrintDetails { get; set; }
+
     }
 }
\ No newline at end of file
diff --git a/Digipost.Api.Client.Domain/SendMessage/IRecipient.cs b/Digipost.Api.Client.Domain/SendMessage/IRecipient.cs
deleted file mode 100755
index 945b5c3b..00000000
--- a/Digipost.Api.Client.Domain/SendMessage/IRecipient.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Digipost.Api.Client.Domain.Enums;
-using Digipost.Api.Client.Domain.Print;
-
-namespace Digipost.Api.Client.Domain.SendMessage
-{
-    public interface IRecipient
-    {
-        object IdentificationValue { get; set; }
-
-        PrintDetails PrintDetails{ get; set; }
-
-        IdentificationChoiceType? IdentificationType { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Digipost.Api.Client.Domain/SendMessage/IRecipientById.cs b/Digipost.Api.Client.Domain/SendMessage/IRecipientById.cs
new file mode 100755
index 00000000..e931f5e1
--- /dev/null
+++ b/Digipost.Api.Client.Domain/SendMessage/IRecipientById.cs
@@ -0,0 +1,11 @@
+using Digipost.Api.Client.Domain.Enums;
+
+namespace Digipost.Api.Client.Domain.SendMessage
+{
+    public interface IRecipientById
+    {
+        IdentificationType IdentificationType { get; set; }
+
+        string Id { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Digipost.Api.Client.Domain/SendMessage/IRecipientByNameAndAddress.cs b/Digipost.Api.Client.Domain/SendMessage/IRecipientByNameAndAddress.cs
index 6dca0de1..3ec283ec 100755
--- a/Digipost.Api.Client.Domain/SendMessage/IRecipientByNameAndAddress.cs
+++ b/Digipost.Api.Client.Domain/SendMessage/IRecipientByNameAndAddress.cs
@@ -4,44 +4,20 @@ namespace Digipost.Api.Client.Domain.SendMessage
 {
     public interface IRecipientByNameAndAddress
     {
-        /// <summary>
-        ///     Full name of person, first name first.
-        /// </summary>
         string FullName { get; set; }
 
-        /// <summary>
-        ///     Primary address
-        /// </summary>
         string AddressLine1 { get; set; }
 
-        /// <summary>
-        ///     Secondary addressline
-        /// </summary>
         string AddressLine2 { get; set; }
 
-        /// <summary>
-        ///     Postal code
-        /// </summary>
         string PostalCode { get; set; }
 
-        /// <summary>
-        ///     City
-        /// </summary>
         string City { get; set; }
 
-        /// <summary>
-        ///     Birth date
-        /// </summary>
         DateTime? BirthDate { get; set; }
 
-        /// <summary>
-        ///     Phone number
-        /// </summary>
         string PhoneNumber { get; set; }
 
-        /// <summary>
-        ///     E-mail address
-        /// </summary>
         string Email { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Digipost.Api.Client.Domain/SendMessage/Message.cs b/Digipost.Api.Client.Domain/SendMessage/Message.cs
index 1cca0258..ebaba541 100755
--- a/Digipost.Api.Client.Domain/SendMessage/Message.cs
+++ b/Digipost.Api.Client.Domain/SendMessage/Message.cs
@@ -1,29 +1,33 @@
 using System;
 using System.Collections.Generic;
 using Digipost.Api.Client.Domain.Enums;
+using Digipost.Api.Client.Domain.Print;
 
 namespace Digipost.Api.Client.Domain.SendMessage
 {
     public class Message : IMessage
     {
+        public IDigipostRecipient DigipostRecipient { get; set; }
+
         /// <summary>
         /// A message to be delivered to a Recipient. 
         /// </summary>
-        /// <param name="recipient">The recipient recieving the message.</param>
+        /// <param name="digipostRecipient">The recipient recieving the message.</param>
         /// <param name="primaryDocument">The primary document sent to the recipient.</param>
-        /// <param name="senderId">The id of the sender, created by Digipost.  If you are delivering a 
-        /// message on behalf of an organization, and permission to do so is set, this is the parameter to set. </param>
-        public Message(IRecipient recipient, IDocument primaryDocument, string senderId = null)
+        public Message(IDigipostRecipient digipostRecipient, IDocument primaryDocument)
         {
-            Recipient = recipient;
+            DigipostRecipient = digipostRecipient;
             PrimaryDocument = primaryDocument;
-            SenderId = senderId;
             Attachments = new List<IDocument>();
         }
 
-        public string SenderId { get; set; }
+        public IPrintDetails PrintDetails { get; set; }
 
-        public IRecipient Recipient { get; set; }
+        /// <summary>
+        /// The id of the sender, created by Digipost.  If you are delivering a 
+        /// message on behalf of an organization, and permission to do so is set, this is the parameter to set.
+        /// </summary>
+        public string SenderId { get; set; }
         
         public DateTime? DeliveryTime { get; set; }
 
diff --git a/Digipost.Api.Client.Domain/SendMessage/Recipient.cs b/Digipost.Api.Client.Domain/SendMessage/Recipient.cs
deleted file mode 100755
index 6e45c315..00000000
--- a/Digipost.Api.Client.Domain/SendMessage/Recipient.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using Digipost.Api.Client.Domain.Enums;
-using Digipost.Api.Client.Domain.Print;
-
-namespace Digipost.Api.Client.Domain.SendMessage
-{
-    public class Recipient : IRecipient
-    {
-        /// <summary>
-        ///     Preferred digital delivery with fallback to physical delivery.
-        /// </summary>
-        public Recipient(RecipientByNameAndAddress recipientByNameAndAddress, PrintDetails printDetails = null)
-            : this(IdentificationChoiceType.NameAndAddress, recipientByNameAndAddress, printDetails)
-        {
-
-        }
-
-        /// <summary>
-        ///     Preferred digital delivery with fallback to physical delivery.
-        /// </summary>
-        public Recipient(IdentificationChoiceType identificationChoiceType, string id, PrintDetails printDetails = null)
-            : this(identificationChoiceType, (object)id, printDetails)
-        {
-        }
-
-        private Recipient(IdentificationChoiceType identificationChoiceType, object value, PrintDetails printDetails = null)
-        {
-            IdentificationType = identificationChoiceType;
-            IdentificationValue = value;
-            PrintDetails = printDetails;
-        }
-
-        /// <summary>
-        ///     Preferred physical delivery (not Digital).
-        /// </summary>
-        public Recipient(PrintDetails printDetails)
-        {
-            PrintDetails = printDetails;
-        }
-
-        public object IdentificationValue { get; set; }
-
-        public PrintDetails PrintDetails { get; set; }
-
-        public IdentificationChoiceType? IdentificationType { get; set; }
-    }
-}
-
diff --git a/Digipost.Api.Client.Domain/SendMessage/RecipientById.cs b/Digipost.Api.Client.Domain/SendMessage/RecipientById.cs
new file mode 100755
index 00000000..fdf8b579
--- /dev/null
+++ b/Digipost.Api.Client.Domain/SendMessage/RecipientById.cs
@@ -0,0 +1,18 @@
+using Digipost.Api.Client.Domain.Enums;
+using Digipost.Api.Client.Domain.Print;
+
+namespace Digipost.Api.Client.Domain.SendMessage
+{
+    public class RecipientById : DigipostRecipient
+    {
+        public RecipientById(IdentificationType identificationType, string id)
+        {
+            IdentificationType = identificationType;
+            Id = id;
+        }
+
+        public string Id { get; set; }
+
+        public IdentificationType IdentificationType { get; set; }
+    }
+}
diff --git a/Digipost.Api.Client.Domain/SendMessage/RecipientByNameAndAddress.cs b/Digipost.Api.Client.Domain/SendMessage/RecipientByNameAndAddress.cs
index 8719c70d..4f8375ec 100755
--- a/Digipost.Api.Client.Domain/SendMessage/RecipientByNameAndAddress.cs
+++ b/Digipost.Api.Client.Domain/SendMessage/RecipientByNameAndAddress.cs
@@ -1,61 +1,31 @@
 using System;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Xml.Serialization;
 
 namespace Digipost.Api.Client.Domain.SendMessage
 {
-    [Serializable]
-    [DebuggerStepThrough]
-    [DesignerCategory("code")]
-    [XmlType(TypeName = "name-and-address", Namespace = "http://api.digipost.no/schema/v6")]
-    public class RecipientByNameAndAddress : IRecipientByNameAndAddress
+    public class RecipientByNameAndAddress : DigipostRecipient, IRecipientByNameAndAddress
     {
-        private RecipientByNameAndAddress()
-        {
-            /**Must exist for serialization.**/
-            BirthDate = null;
-        }
-
-        public RecipientByNameAndAddress(string fullName, string postalCode, string city, string addressLine)
+        public RecipientByNameAndAddress(string fullName, string addressLine1, string postalCode, string city)
         {
             FullName = fullName;
-            AddressLine1 = addressLine;
             PostalCode = postalCode;
             City = city;
+            AddressLine1 = addressLine1;
         }
 
-        [XmlElement("fullname")]
         public string FullName { get; set; }
-
-        [XmlElement("addressline1")]
+        
         public string AddressLine1 { get; set; }
-
-        [XmlElement("addressline2")]
+        
         public string AddressLine2 { get; set; }
-
-        [XmlElement("postalcode")]
+        
         public string PostalCode { get; set; }
-
-        [XmlElement("city")]
+        
         public string City { get; set; }
-
-        [XmlElement("birth-date", DataType = "date")]
+        
         public DateTime? BirthDate { get; set; }
-
-        [XmlElement("phone-number")]
+        
         public string PhoneNumber { get; set; }
-
-        [XmlElement("email-address")]
+        
         public string Email { get; set; }
-
-        public bool ShouldSerializeBirthDate()
-        {
-            /** Note: This field must have same name as BirthDate with prefix ShouldSerialize in order to work.
-                Is recognized by framework, as seen in: 
-                http://stackoverflow.com/questions/1296468/suppress-null-value-types-from-being-emitted-by-xmlserializer
-             **/
-            return BirthDate != null;
-        }
     }
-}
\ No newline at end of file
+}
diff --git a/Digipost.Api.Client.Domain/SendMessage/RecipientByNameAndAddressDataTranferObject.cs b/Digipost.Api.Client.Domain/SendMessage/RecipientByNameAndAddressDataTranferObject.cs
new file mode 100755
index 00000000..c407732a
--- /dev/null
+++ b/Digipost.Api.Client.Domain/SendMessage/RecipientByNameAndAddressDataTranferObject.cs
@@ -0,0 +1,61 @@
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Xml.Serialization;
+
+namespace Digipost.Api.Client.Domain.SendMessage
+{
+    [Serializable]
+    [DebuggerStepThrough]
+    [DesignerCategory("code")]
+    [XmlType(TypeName = "name-and-address", Namespace = "http://api.digipost.no/schema/v6")]
+    public class RecipientByNameAndAddressDataTranferObject : IRecipientByNameAndAddress
+    {
+        private RecipientByNameAndAddressDataTranferObject()
+        {
+            /**Must exist for serialization.**/
+            BirthDate = null;
+        }
+
+        public RecipientByNameAndAddressDataTranferObject(string fullName, string postalCode, string city, string addressLine1)
+        {
+            FullName = fullName;
+            AddressLine1 = addressLine1;
+            PostalCode = postalCode;
+            City = city;
+        }
+
+        [XmlElement("fullname")]
+        public string FullName { get; set; }
+
+        [XmlElement("addressline1")]
+        public string AddressLine1 { get; set; }
+
+        [XmlElement("addressline2")]
+        public string AddressLine2 { get; set; }
+
+        [XmlElement("postalcode")]
+        public string PostalCode { get; set; }
+
+        [XmlElement("city")]
+        public string City { get; set; }
+
+        [XmlElement("birth-date", DataType = "date")]
+        public DateTime? BirthDate { get; set; }
+
+        [XmlElement("phone-number")]
+        public string PhoneNumber { get; set; }
+
+        [XmlElement("email-address")]
+        public string Email { get; set; }
+
+        public bool ShouldSerializeBirthDate()
+        {
+            /** Note: This field must have same name as BirthDate with prefix ShouldSerialize in order to work.
+                Is recognized by framework, as seen in: 
+                http://stackoverflow.com/questions/1296468/suppress-null-value-types-from-being-emitted-by-xmlserializer
+             **/
+            return BirthDate != null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Digipost.Api.Client.Domain/Utilities/DataTransferObjectConverter.cs b/Digipost.Api.Client.Domain/Utilities/DataTransferObjectConverter.cs
index 2b293a66..bdaea1a2 100755
--- a/Digipost.Api.Client.Domain/Utilities/DataTransferObjectConverter.cs
+++ b/Digipost.Api.Client.Domain/Utilities/DataTransferObjectConverter.cs
@@ -1,11 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
 using Digipost.Api.Client.Domain.DataTransferObjects;
 using Digipost.Api.Client.Domain.Enums;
 using Digipost.Api.Client.Domain.Identify;
 using Digipost.Api.Client.Domain.Print;
 using Digipost.Api.Client.Domain.SendMessage;
+using Digipost.Api.Client.Domain.Extensions;
 
 namespace Digipost.Api.Client.Domain.Utilities
 {
@@ -15,67 +14,57 @@ public static IdentificationDataTransferObject ToDataTransferObject(IIdentificat
         {
             IdentificationDataTransferObject identificationDataTransferObject = null;
 
-            if (identification is Identification)
+            if (identification.DigipostRecipient is RecipientById)
             {
-                identificationDataTransferObject = IdentificationDataTransferObjectFromIdentification((Identification) identification);
+                identificationDataTransferObject = IdentificationDataTransferObjectFromIdentificationById((RecipientById)identification.DigipostRecipient);
             }
 
-            if (identification is IdentificationById)
+            if (identification.DigipostRecipient is RecipientByNameAndAddress )
             {
-                identificationDataTransferObject = IdentificationDataTransferObjectFromIdentificationById((IdentificationById) identification);
+                identificationDataTransferObject = IdentificationDataTranferObjectFromIdentificationByNameAndAddress((RecipientByNameAndAddress)identification.DigipostRecipient);
             }
 
-            if (identification is IdentificationByNameAndAddress)
-            {
-                identificationDataTransferObject = IdentificationDataTranferObjectFromIdentificationByNameAndAddress((IdentificationByNameAndAddress) identification);
-            }
 
             return identificationDataTransferObject;
         }
 
-        private static IdentificationDataTransferObject IdentificationDataTransferObjectFromIdentification(
-            Identification identification)
-        {
-            IdentificationDataTransferObject identificationDataTransferObject = null;
-
-            if (identification.IdentificationChoiceType == IdentificationChoiceType.NameAndAddress)
-            {
-                identificationDataTransferObject =
-                    new IdentificationDataTransferObject((RecipientByNameAndAddress) identification.Data);
-            }
-            else
-            {
-                identificationDataTransferObject = new IdentificationDataTransferObject(identification.IdentificationChoiceType, identification.Data.ToString());
-            }
-
-            return identificationDataTransferObject;
-        }
-
-        private static IdentificationDataTransferObject IdentificationDataTransferObjectFromIdentificationById(IdentificationById identificationById)
+        private static IdentificationDataTransferObject IdentificationDataTransferObjectFromIdentificationById(RecipientById recipientById)
         {
             return new  IdentificationDataTransferObject(
-                identificationById.IdentificationChoiceType, 
-                identificationById.Value
+                recipientById.IdentificationType.ToIdentificationChoiceType(),
+                recipientById.Id
                 );
         }
 
         private static IdentificationDataTransferObject IdentificationDataTranferObjectFromIdentificationByNameAndAddress(
-            IdentificationByNameAndAddress identificationByNameAndAddress)
-        {
-            return new IdentificationDataTransferObject(identificationByNameAndAddress.RecipientByNameAndAddress);
+            RecipientByNameAndAddress identification)
+        {
+            return new IdentificationDataTransferObject(new RecipientByNameAndAddressDataTranferObject(
+                identification.FullName, identification.PostalCode, identification.City, identification.AddressLine1
+                )
+            {
+                AddressLine2 = identification.AddressLine2,
+                BirthDate = identification.BirthDate,
+                PhoneNumber = identification.PhoneNumber,
+                Email = identification.Email
+            });
         }
 
         public static MessageDataTransferObject ToDataTransferObject(IMessage message)
         {
-            RecipientDataTransferObject recipient = ToDataTransferObject(message.Recipient);
-            DocumentDataTransferObject primaryDocumentDataTransferObject = ToDataTransferObject(message.PrimaryDocument);
-
-            var messageDataTransferObject = new MessageDataTransferObject(recipient, primaryDocumentDataTransferObject, message.SenderId);
+            var recipient = ToDataTransferObject(message.DigipostRecipient);
+            var primaryDocumentDataTransferObject = ToDataTransferObject(message.PrimaryDocument);
+            var printDetailsDataTransferObject = ToDataTransferObject(message.PrintDetails);
 
-            foreach (var attachment in message.Attachments)
+            var messageDataTransferObject = new MessageDataTransferObject(recipient, primaryDocumentDataTransferObject,
+                message.SenderId)
             {
-                var attachmentDataTransferObject = ToDataTransferObject(attachment);
-                messageDataTransferObject.Attachments.Add(attachmentDataTransferObject);
+                RecipientDataTransferObject = {PrintDetailsDataTransferObject = printDetailsDataTransferObject}
+            };
+
+            foreach (var attachmentDataTransferObject in message.Attachments.Select(ToDataTransferObject))
+            {
+                messageDataTransferObject.Attachments.Add(attachmentDataTransferObject);
             }
 
             messageDataTransferObject.DeliveryTime = message.DeliveryTime;
@@ -94,30 +83,52 @@ public static DocumentDataTransferObject ToDataTransferObject(IDocument document
             return documentDataTransferObject;
         }
 
-        public static RecipientDataTransferObject ToDataTransferObject(IRecipient recipient)
+        public static RecipientDataTransferObject ToDataTransferObject(IDigipostRecipient recipient)
         {
-            PrintDetailsDataTransferObject printDetailsDataTransferObject =
-                ToDataTransferObject(recipient.PrintDetails);
+            RecipientDataTransferObject recipientDataTransferObject = null;
 
-            RecipientDataTransferObject recipientDataTransferObject;
-            switch (recipient.IdentificationType)
+            if (recipient is RecipientById)
             {
-                case IdentificationChoiceType.NameAndAddress:
-                    recipientDataTransferObject = new RecipientDataTransferObject((RecipientByNameAndAddress)recipient.IdentificationValue, printDetailsDataTransferObject);
-                    break;
-                default:
-                    IdentificationChoiceType identificationType = (IdentificationChoiceType)recipient.IdentificationType;
-
-                    recipientDataTransferObject = new RecipientDataTransferObject(identificationType, (string)recipient.IdentificationValue, printDetailsDataTransferObject);
-                    break;
-                case null:
-                    recipientDataTransferObject = new RecipientDataTransferObject(printDetailsDataTransferObject);
-                    break;
+                recipientDataTransferObject = RecipientDataTransferObjectFromRecipientById((RecipientById)recipient);
             }
 
+            if (recipient is RecipientByNameAndAddress)
+            {
+                recipientDataTransferObject = RecipientDataTransferObjectFromRecipientByNameAndAddress((RecipientByNameAndAddress)recipient);
+            }
+            
             return recipientDataTransferObject;
         }
 
+        private static RecipientDataTransferObject RecipientDataTransferObjectFromRecipientById(RecipientById recipient)
+        {
+            return new RecipientDataTransferObject(
+                recipient.IdentificationType.ToIdentificationChoiceType(), 
+                recipient.Id
+                );
+        }
+
+        private static RecipientDataTransferObject RecipientDataTransferObjectFromRecipientByNameAndAddress(
+            RecipientByNameAndAddress recipientByNameAndAddress)
+        {
+            RecipientDataTransferObject recipientDataTransferObject;
+
+            recipientDataTransferObject = new RecipientDataTransferObject(
+                new RecipientByNameAndAddressDataTranferObject(
+                    recipientByNameAndAddress.FullName,
+                    recipientByNameAndAddress.PostalCode,
+                    recipientByNameAndAddress.City,
+                    recipientByNameAndAddress.AddressLine1)
+                {
+                    AddressLine2 = recipientByNameAndAddress.AddressLine2,
+                    BirthDate = recipientByNameAndAddress.BirthDate,
+                    PhoneNumber = recipientByNameAndAddress.PhoneNumber,
+                    Email = recipientByNameAndAddress.Email
+                }
+              );
+            return recipientDataTransferObject;
+        }
+
         public static PrintDetailsDataTransferObject ToDataTransferObject(IPrintDetails printDetails)
         {
             if (printDetails == null)
@@ -128,40 +139,53 @@ public static PrintDetailsDataTransferObject ToDataTransferObject(IPrintDetails
 
             PrintDetailsDataTransferObject printDetailsDataTransferObject = new PrintDetailsDataTransferObject(null, null, printDetails.PostType, printDetails.PrintColors, printDetails.NondeliverableHandling);
             
-            //Set recipient on pDTO
-            if (recipient.Address is INorwegianAddress)
-            {
-                var addr = (INorwegianAddress) recipient.Address;
-                printDetailsDataTransferObject.PrintRecipientDataTransferObject = new PrintRecipientDataTransferObject(recipient.Name,
-                    new NorwegianAddressDataTransferObject(addr.PostalCode, addr.City, addr.AddressLine1,
-                        addr.AddressLine2, addr.AddressLine3));
-            }
-            else
-            {
-                var addr = (IForeignAddress)recipient.Address;
-                printDetailsDataTransferObject.PrintRecipientDataTransferObject = new PrintRecipientDataTransferObject(recipient.Name,
-                    new ForeignAddressDataTransferObject(addr.CountryIdentifier, addr.CountryIdentifierValue, addr.AddressLine1, addr.AddressLine2, addr.AddressLine3, addr.Addressline4));
-            }
-
-            {
-                //Set return recipient on pDTO
-                if (ret.Address is INorwegianAddress)
-                {
-                    var addr = (INorwegianAddress) ret.Address;
-                    printDetailsDataTransferObject.PrintReturnRecipientDataTransferObject = new PrintReturnRecipientDataTransferObject(recipient.Name,
-                        new NorwegianAddressDataTransferObject(addr.PostalCode, addr.City, addr.AddressLine1,
-                            addr.AddressLine2, addr.AddressLine3));
-                }
-                else
-                {
-                    var addr = (IForeignAddress) ret.Address;
-                    printDetailsDataTransferObject.PrintRecipientDataTransferObject = new PrintRecipientDataTransferObject(recipient.Name,
-                        new ForeignAddressDataTransferObject(addr.CountryIdentifier, addr.CountryIdentifierValue,
-                            addr.AddressLine1, addr.AddressLine2, addr.AddressLine3, addr.Addressline4));
-                }
-            }
+            SetPrintRecipientOnDataTransferObject(recipient, printDetailsDataTransferObject);
+            SetPrintReturnRecipientOnDataTranferObject(ret, printDetailsDataTransferObject);
 
             return printDetailsDataTransferObject;
+        }
+
+        private static void SetPrintReturnRecipientOnDataTranferObject(IPrintReturnRecipient printReturnRecipient,
+            PrintDetailsDataTransferObject printDetailsDataTransferObject)
+        {
+            if (printReturnRecipient.Address is INorwegianAddress)
+            {
+                var addr = (INorwegianAddress)printReturnRecipient.Address;
+                printDetailsDataTransferObject.PrintReturnRecipientDataTransferObject =
+                    new PrintReturnRecipientDataTransferObject(printReturnRecipient.Name,
+                        new NorwegianAddressDataTransferObject(addr.PostalCode, addr.City, addr.AddressLine1,
+                            addr.AddressLine2, addr.AddressLine3));
+            }
+            else
+            {
+                var addr = (IForeignAddress)printReturnRecipient.Address;
+                printDetailsDataTransferObject.PrintRecipientDataTransferObject =
+                    new PrintRecipientDataTransferObject(printReturnRecipient.Name,
+                        new ForeignAddressDataTransferObject(addr.CountryIdentifier, addr.CountryIdentifierValue,
+                            addr.AddressLine1, addr.AddressLine2, addr.AddressLine3, addr.Addressline4));
+            }
+
+        }
+
+        private static void SetPrintRecipientOnDataTransferObject(IPrintRecipient recipient,
+            PrintDetailsDataTransferObject printDetailsDataTransferObject)
+        {
+            if (recipient.Address is INorwegianAddress)
+            {
+                var addr = (INorwegianAddress) recipient.Address;
+                printDetailsDataTransferObject.PrintRecipientDataTransferObject =
+                    new PrintRecipientDataTransferObject(recipient.Name,
+                        new NorwegianAddressDataTransferObject(addr.PostalCode, addr.City, addr.AddressLine1,
+                            addr.AddressLine2, addr.AddressLine3));
+            }
+            else
+            {
+                var addr = (IForeignAddress) recipient.Address;
+                printDetailsDataTransferObject.PrintRecipientDataTransferObject =
+                    new PrintRecipientDataTransferObject(recipient.Name,
+                        new ForeignAddressDataTransferObject(addr.CountryIdentifier, addr.CountryIdentifierValue,
+                            addr.AddressLine1, addr.AddressLine2, addr.AddressLine3, addr.Addressline4));
+            }
         }
 
         public static ForeignAddressDataTransferObject ToDataTransferObject(IForeignAddress foreignAddress)
diff --git a/Digipost.Api.Client.Domain/packages.config b/Digipost.Api.Client.Domain/packages.config
deleted file mode 100755
index 4e1708be..00000000
--- a/Digipost.Api.Client.Domain/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<packages>
-  <package id="api-client-shared" version="1.0.5637.25994" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/Digipost.Api.Client.Testklient/Program.cs b/Digipost.Api.Client.Testklient/Program.cs
index 18689db7..168b8b7c 100755
--- a/Digipost.Api.Client.Testklient/Program.cs
+++ b/Digipost.Api.Client.Testklient/Program.cs
@@ -21,7 +21,7 @@ namespace Digipost.Api.Client.Testklient
     internal class Program
     {
         private static readonly string Thumbprint = Settings.Default.ThumbprintDnBLocalQa;
-        private static readonly string SenderId = Settings.Default.SenderidDnbLocalhost;
+        private static readonly string SenderId = Settings.Default.SenderIdDnbQa2;
         private static readonly string Url = Settings.Default.Url;
 
         private static readonly ResourceUtility ResourceUtility =
@@ -63,8 +63,8 @@ private static void Send()
             //Logging.Initialize(config);
             var api = new DigipostClient(config, Thumbprint);
 
-            IdentifyPerson(api);
-            //SendMessageToPerson(api, false);
+            //IdentifyPerson(api);
+            SendMessageToPerson(api, false);
             var response = Search(api);
 
             
@@ -79,21 +79,33 @@ private static ISearchDetailsResult Search(DigipostClient api)
             return api.Search("Al");
         }
 
-        private static void SendMessageToPerson(DigipostClient api, bool isQaOrLocal = false)
+        private static async void SendMessageToPerson(DigipostClient api, bool isQaOrLocal = false)
         {
             Console.WriteLine("======================================");
             Console.WriteLine("Sending message:");
             Console.WriteLine("======================================");
             IMessage message;
 
-            message = isQaOrLocal ? GetMessageForQaOrLocal() : GetMessage();
-            
+            message = isQaOrLocal ? GetMessageWithRecipientByIdForQaOrLocal() : GetMessage();
+
             try
             {
+                var messageDeliveryResult = await api.SendMessageAsync(message);
                 Console.WriteLine("> Starter å sende melding");
-                var messageDeliveryResult = api.SendMessage(message);
-                Logging.Log(TraceEventType.Information, ""+messageDeliveryResult);
-                WriteToConsoleWithColor("> Alt gikk fint!" , false);
+                WriteToConsoleWithColor("Meldingens status: " + messageDeliveryResult.Status);
+                WriteToConsoleWithColor("> Alt gikk fint!", false);
+            }
+            catch (AggregateException ae)
+            {
+                ae.Handle((x) =>
+                 {
+                     if (x is ClientResponseException)
+                     {
+                         Console.WriteLine("This really failed!");
+                         return true;
+                     }
+                     return false;
+                 });
             }
             catch (ClientResponseException e)
             {
@@ -102,6 +114,7 @@ private static void SendMessageToPerson(DigipostClient api, bool isQaOrLocal = f
             }
             catch (Exception e)
             {
+
                 WriteToConsoleWithColor("> Oh snap... " + e.Message + e.InnerException.Message, true);
             }
         }
@@ -113,7 +126,7 @@ private static void IdentifyPerson(DigipostClient api)
             Console.WriteLine("======================================");
 
             //var identification = new Identification(IdentificationChoice.PersonalidentificationNumber, "01013300001");
-            var identification = new IdentificationById(IdentificationType.DigipostAddress, "jarand.bjarte.t.k.grindheim#71WZ");
+            var identification = new Identification(new RecipientById(IdentificationType.DigipostAddress, "jarand.bjarte.t.k.grindheim#71WZ"));
 
             try
             {
@@ -137,12 +150,12 @@ private static void IdentifyPerson(DigipostClient api)
             }
         }
 
-        private static IMessage GetMessageForQaOrLocal()
+        private static IMessage GetMessageWithRecipientByIdForQaOrLocal()
         {
             //primary document
             var primaryDocument = new Document(subject: "Primary document", fileType: "txt", contentBytes: GetPrimaryDocument());
    
-            var digitalRecipient = new Recipient(IdentificationChoiceType.PersonalidentificationNumber, "01013300001");
+            var digitalRecipient = new RecipientById(IdentificationType.PersonalIdentificationNumber, "01013300001");
 
             var message = new Message(digitalRecipient, primaryDocument);
 
@@ -167,16 +180,21 @@ private static IMessage GetMessage()
                     );
 
             //recipientIdentifier for digital mail
-            var recipientByNameAndAddress = new RecipientByNameAndAddress("Kristian Sæther Enge", "0460",
+            var recipientByNameAndAddress = new RecipientByNameAndAddressDataTranferObject("Kristian Sæther Enge", "0460",
+                "Oslo", "Collettsgate 68");
+
+            //Nytt regime for message
+            var recipientByNameAndAddressNew = new RecipientByNameAndAddress("Kristian Sæther Enge", "0460",
                 "Oslo", "Collettsgate 68");
 
-            //recipient
-            var digitalRecipientWithFallbackPrint = new Recipient(recipientByNameAndAddress, printDetails);
 
+            var recipientById = new RecipientById(IdentificationType.DigipostAddress, "jarand.bjarte.t.k.grindheim#71WZ");
+
+            //End nytt regime for message
+            
             //message
             //var message = new Message(digitalRecipientWithFallbackPrint, invoice);
-            var message = new Message(digitalRecipientWithFallbackPrint,invoice) 
-                {};
+            var message = new Message(recipientById, invoice);
             
             //message.Deliverytime = DateTime.Now.AddDays(1);
 
diff --git a/Digipost.Api.Client.Tests/Digipost.Api.Client.Tests.csproj b/Digipost.Api.Client.Tests/Digipost.Api.Client.Tests.csproj
index f32cff27..3c99611a 100755
--- a/Digipost.Api.Client.Tests/Digipost.Api.Client.Tests.csproj
+++ b/Digipost.Api.Client.Tests/Digipost.Api.Client.Tests.csproj
@@ -108,8 +108,6 @@
     <Compile Include="Unittest\DtoTests\DocumentTests.cs" />
     <Compile Include="Unittest\DtoTests\DataTransferObjectConverterTests.cs" />
     <Compile Include="Unittest\DtoTests\ForeignAddressTests.cs" />
-    <Compile Include="Unittest\DtoTests\IdentificationByIdTests.cs" />
-    <Compile Include="Unittest\DtoTests\IdentificationByNameAndAddressTests.cs" />
     <Compile Include="Unittest\DtoTests\IdentificationResultTests.cs" />
     <Compile Include="Unittest\DtoTests\IdentificationTests.cs" />
     <Compile Include="Unittest\DtoTests\InvoiceTests.cs" />
@@ -118,7 +116,8 @@
     <Compile Include="Unittest\DtoTests\PrintDetailsTests.cs" />
     <Compile Include="Unittest\DtoTests\PrintReturnRecipientTests.cs" />
     <Compile Include="Unittest\DtoTests\PrintRecipientTests.cs" />
-    <Compile Include="Unittest\DtoTests\RecipientTests.cs" />
+    <Compile Include="Unittest\DtoTests\RecipientByIdTests.cs" />
+    <Compile Include="Unittest\DtoTests\RecipientByNameAndAddressTests.cs" />
     <Compile Include="Unittest\DtoTests\SmsNotificationTests.cs" />
     <Compile Include="Unittest\SerializeUtilTests.cs" />
     <Compile Include="Unittest\DigipostActionFactoryTests.cs" />
diff --git a/Digipost.Api.Client.Tests/Integration/DigipostApiIntegration.cs b/Digipost.Api.Client.Tests/Integration/DigipostApiIntegration.cs
index 14bc34de..dd71a30b 100755
--- a/Digipost.Api.Client.Tests/Integration/DigipostApiIntegration.cs
+++ b/Digipost.Api.Client.Tests/Integration/DigipostApiIntegration.cs
@@ -47,9 +47,25 @@ public void Init()
         public class SendMessageMethod : DigipostApiIntegrationTests
         {
             [TestMethod]
-            public void ProperRequestSent()
+            public void ProperRequestSentRecipientById()
             {
-                var message = DomainUtility.GetSimpleMessage();
+                var message = DomainUtility.GetSimpleMessageWithRecipientById();
+
+                var fakehandler = new FakeHttpClientHandlerForMessageResponse();
+                var fakeHandlerChain = CreateHandlerChain(fakehandler);
+
+                var mockFacktory = CreateMockFactoryReturningMessage(message, fakeHandlerChain);
+
+                var digipostApi = new DigipostApi(ClientConfig, Certificate);
+                SetMockFactoryForDigipostApi(digipostApi, mockFacktory);
+
+                digipostApi.SendMessage(message);
+            }
+            
+            [TestMethod]
+            public void ProperRequestSentRecipientByNameAndAddress()
+            {
+                var message = DomainUtility.GetSimpleMessageWithRecipientByNameAndAddress();
 
                 var fakehandler = new FakeHttpClientHandlerForMessageResponse();
                 var fakeHandlerChain = CreateHandlerChain(fakehandler);
@@ -67,7 +83,7 @@ public void InternalServerErrorShouldCauseDigipostResponseException()
             {
                 try
                 {
-                    var message = DomainUtility.GetSimpleMessage();
+                    var message = DomainUtility.GetSimpleMessageWithRecipientById();
 
                     const HttpStatusCode statusCode = HttpStatusCode.InternalServerError;
                     var messageContent = new StringContent(string.Empty);
@@ -93,7 +109,7 @@ public void ShouldSerializeErrorMessage()
             {
                 try
                 {
-                    var message = DomainUtility.GetSimpleMessage();
+                    var message = DomainUtility.GetSimpleMessageWithRecipientById();
 
                     const HttpStatusCode statusCode = HttpStatusCode.NotFound;
                     var messageContent = new StringContent(
@@ -115,8 +131,6 @@ public void ShouldSerializeErrorMessage()
                 }
             }
 
-            
-
             private static FakeHttpClientHandlerForMessageResponse CreateFakeMessageHttpResponse(HttpStatusCode statusCode,
                 StringContent messageContent)
             {
diff --git a/Digipost.Api.Client.Tests/Integration/DomainUtility.cs b/Digipost.Api.Client.Tests/Integration/DomainUtility.cs
index 0bb888e0..d2d11e70 100755
--- a/Digipost.Api.Client.Tests/Integration/DomainUtility.cs
+++ b/Digipost.Api.Client.Tests/Integration/DomainUtility.cs
@@ -1,5 +1,7 @@
-using ApiClientShared;
-using Digipost.Api.Client.Domain;
+using System;
+using System.Collections.Generic;
+using ApiClientShared;
+using Digipost.Api.Client.Domain.DataTransferObjects;
 using Digipost.Api.Client.Domain.Enums;
 using Digipost.Api.Client.Domain.Identify;
 using Digipost.Api.Client.Domain.Print;
@@ -11,10 +13,108 @@ public class DomainUtility
     {
         static readonly ResourceUtility ResourceUtility = new ResourceUtility("Digipost.Api.Client.Tests.Resources");
 
-        public static IMessage GetSimpleMessage()
+        public static IMessage GetSimpleMessageWithRecipientById()
         {
             var message = new Message(
-                new Recipient(IdentificationChoiceType.PersonalidentificationNumber, "00000000000"),
+                new RecipientById(IdentificationType.PersonalIdentificationNumber, "00000000000"),
+                GetDocument()
+                );
+            return message;
+        }
+
+        public static IMessage GetMessageWithBytesAndStaticGuidRecipientById()
+        {
+            var deliverytime = DateTime.Today.AddDays(3);
+            var recipientById = GetRecipientByDigipostId();
+
+            return new Message(
+                    recipientById,
+                    new Document("TestSubject", "txt", new byte[3])
+                )
+                {
+                    SenderId = "SenderId",
+                    Attachments = new List<IDocument>()
+                    {
+                        new Document("TestSubject attachment", "txt",  new byte[3])
+                        {
+                            Guid = "attachmentGuid"
+                        }
+                    },
+                    DeliveryTime = deliverytime,
+                    PrimaryDocument = { Guid = "attachmentGuidPrimary" }
+                };
+        }
+
+        public static MessageDataTransferObject GetMessageDataTransferObjectWithBytesAndStaticGuidRecipientById()
+        {
+            var deliverytime = DateTime.Today.AddDays(3);
+            var recipientDataTransferObject = GetRecipientByDigipostIdDataTransferObject();
+
+            return new MessageDataTransferObject(
+                    recipientDataTransferObject,
+                    new DocumentDataTransferObject("TestSubject", "txt", new byte[3]), "SenderId")
+                {
+                    Attachments = new List<DocumentDataTransferObject>
+                        {
+                            new DocumentDataTransferObject("TestSubject attachment", "txt", new byte[3])
+                            {
+                                Guid = "attachmentGuid"
+                            }
+                        },
+                    DeliveryTime = deliverytime,
+                    PrimaryDocumentDataTransferObject = { Guid = "attachmentGuidPrimary" }
+                };
+        }
+
+        public static IMessage GetMessageWithBytesAndStaticGuidRecipientByNameAndAddress()
+        {
+            var deliverytime = DateTime.Today.AddDays(3);
+            var recipientById = GetRecipientByNameAndAddress();
+
+            return new Message(
+                    recipientById,
+                    new Document("TestSubject", "txt", new byte[3])
+                )
+            {
+                SenderId = "SenderId",
+                Attachments = new List<IDocument>()
+                    {
+                        new Document("TestSubject attachment", "txt",  new byte[3])
+                        {
+                            Guid = "attachmentGuid"
+                        }
+                    },
+                DeliveryTime = deliverytime,
+                PrimaryDocument = { Guid = "attachmentGuidPrimary" }
+            };
+        }
+
+        public static MessageDataTransferObject GetMessageDataTransferObjectWithBytesAndStaticGuidRecipientNameAndAddress()
+        {
+            var deliverytime = DateTime.Today.AddDays(3);
+            var recipientDataTransferObject = GetRecipientByNameAndAndAddressDataTransferObject();
+
+            return new MessageDataTransferObject(
+                    recipientDataTransferObject,
+                    new DocumentDataTransferObject("TestSubject", "txt", new byte[3]), "SenderId"
+                )
+            {
+                Attachments = new List<DocumentDataTransferObject>
+                        {
+                            new DocumentDataTransferObject("TestSubject attachment", "txt", new byte[3])
+                            {
+                                Guid = "attachmentGuid"
+                            }
+                        },
+                DeliveryTime = deliverytime,
+                PrimaryDocumentDataTransferObject = { Guid = "attachmentGuidPrimary" }
+            };
+        }
+
+        public static IMessage GetSimpleMessageWithRecipientByNameAndAddress()
+        {
+            var message = new Message(
+                GetRecipientByNameAndAddress(),
                 GetDocument()
                 );
             return message;
@@ -27,26 +127,62 @@ public static IDocument GetDocument()
 
         public static IIdentification GetPersonalIdentification()
         {
-            var identification = new Identification(IdentificationChoiceType.PersonalidentificationNumber, "00000000000");
+            var identification = new Identification(new RecipientById(IdentificationType.PersonalIdentificationNumber, "00000000000"));
             return identification;
         }
 
         public static IIdentification GetPersonalIdentificationById()
         {
-            var identification = new IdentificationById(IdentificationType.PersonalIdentificationNumber, "00000000000");
+            var identification = new Identification(new RecipientById(IdentificationType.PersonalIdentificationNumber, "00000000000"));
             return identification;
-        }
-
+        }
+
         public static IIdentification GetPersonalIdentificationByNameAndAddress()
         {
-            var identification = new IdentificationByNameAndAddress(new RecipientByNameAndAddress("ola nordmann","0000","Oslo","Biskop gunnerius gate 14a"));
+            var identification = new Identification(new RecipientByNameAndAddress("ola nordmann","0000","Oslo","Biskop gunnerius gate 14a"));
             return identification;
-        }
-
-
-        public static IRecipient GetRecipientWithDigipostId()
+        }
+
+
+        public static RecipientById GetRecipientByDigipostId()
+        {
+            return new RecipientById(IdentificationType.DigipostAddress, "ola.nordmann#246BB");
+        }
+
+        public static RecipientDataTransferObject GetRecipientByDigipostIdDataTransferObject()
+        {
+            return new RecipientDataTransferObject(IdentificationChoiceType.DigipostAddress, "ola.nordmann#246BB");
+        }
+
+        public static RecipientDataTransferObject GetRecipientByNameAndAndAddressDataTransferObject()
+        {
+            return new RecipientDataTransferObject(new RecipientByNameAndAddressDataTranferObject(
+                fullName: "Ola Nordmann", 
+                postalCode: "0001", 
+                city: "Oslo",
+                addressLine1: "Biskop Gunnerus Gate 14"
+                )
+             );
+        }
+
+        public static RecipientByNameAndAddress GetRecipientByNameAndAddress()
+        {
+            return new RecipientByNameAndAddress(
+                fullName: "Ola Nordmann", 
+                postalCode: "0001", 
+                city: "Oslo", 
+                addressLine1: "Biskop Gunnerus Gate 14"
+                );
+        }
+
+        public static RecipientByNameAndAddressDataTranferObject GetRecipientByNameAndAddressDataTransferObject()
         {
-            return new Recipient(IdentificationChoiceType.DigipostAddress, "ola.nordmann#246BB");
+            return new RecipientByNameAndAddressDataTranferObject(
+                fullName: "Ola Nordmann",
+                postalCode: "0001",
+                city: "Oslo",
+                addressLine1: "Osloveien 22"
+                );
         }
 
         public static PrintDetails GetPrintDetails()
@@ -58,6 +194,15 @@ public static PrintDetails GetPrintDetails()
                         new NorwegianAddress("5510", "Sophaugen", "Sophauggata 22")));
         }
 
+        public static PrintDetailsDataTransferObject GetPrintDetailsDataTransferObject()
+        {
+            return
+                new PrintDetailsDataTransferObject(
+                    new PrintRecipientDataTransferObject("Ola Nordmann", new NorwegianAddressDataTransferObject("0115", "Oslo", "Osloveien 15")), 
+                    new PrintReturnRecipientDataTransferObject("Returkongen",
+                        new NorwegianAddressDataTransferObject("5510", "Sophaugen", "Sophauggata 22")));
+        }
+
         public static NorwegianAddress GetNorwegianAddress()
         {
             return new NorwegianAddress("0001", "Oslo", "Addr1", "Addr2", "Addr3");
@@ -83,15 +228,5 @@ public static IPrintReturnRecipient GetPrintReturnRecipientWithNorwegianAddress(
         {
             return new PrintReturnRecipient("name", GetNorwegianAddress());
         }
-
-        public static RecipientByNameAndAddress GetRecipientByNameAndAddress()
-        {
-            return new RecipientByNameAndAddress(
-                    fullName: "Ola Nordmann",
-                    postalCode: "0001",
-                    city: "Oslo",
-                    addressLine: "Osloveien 22"
-                    );
-        }
     }
 }   
\ No newline at end of file
diff --git a/Digipost.Api.Client.Tests/Unittest/ComparatorTests.cs b/Digipost.Api.Client.Tests/Unittest/ComparatorTests.cs
index ec2fc579..522a1796 100755
--- a/Digipost.Api.Client.Tests/Unittest/ComparatorTests.cs
+++ b/Digipost.Api.Client.Tests/Unittest/ComparatorTests.cs
@@ -33,7 +33,7 @@ public void GivesErrorOnDeepCompareDifference()
 
                     var recipient =
                         new RecipientDataTransferObject(
-                            new RecipientByNameAndAddress("Ola Nordmann", "0460", "Oslo", "Colletts gate 68"), printDetails);
+                            new RecipientByNameAndAddressDataTranferObject("Ola Nordmann", "0460", "Oslo", "Colletts gate 68"), printDetails);
 
                     var document = new DocumentDataTransferObject("Subject", "txt", ByteUtility.GetBytes("test"), AuthenticationLevel.TwoFactor,
                         SensitivityLevel.Sensitive) { Guid = "1222222", SmsNotification = new SmsNotificationDataTransferObject(2) };
@@ -53,7 +53,7 @@ public void GivesErrorOnDeepCompareDifference()
 
                     var recipient2 =
                         new RecipientDataTransferObject(
-                            new RecipientByNameAndAddress("Ola Nordmann", "0460", "Oslo", "Colletts gate 68"),
+                            new RecipientByNameAndAddressDataTranferObject("Ola Nordmann", "0460", "Oslo", "Colletts gate 68"),
                             printDetails2);
 
                     var document2 = new DocumentDataTransferObject("Subject", "txt", ByteUtility.GetBytes("test"),
diff --git a/Digipost.Api.Client.Tests/Unittest/DigipostActionFactoryTests.cs b/Digipost.Api.Client.Tests/Unittest/DigipostActionFactoryTests.cs
index c370a715..beb64711 100755
--- a/Digipost.Api.Client.Tests/Unittest/DigipostActionFactoryTests.cs
+++ b/Digipost.Api.Client.Tests/Unittest/DigipostActionFactoryTests.cs
@@ -29,7 +29,7 @@ public void ReturnsProperMessageAction()
             {
                 //Arrange
                 var factory = new DigipostActionFactory();
-                var message = DomainUtility.GetSimpleMessage();
+                var message = DomainUtility.GetSimpleMessageWithRecipientById();
 
                 //Act
                 var action = factory.CreateClass(message, new ClientConfig(), new X509Certificate2(), "uri");
diff --git a/Digipost.Api.Client.Tests/Unittest/DigipostActionTests.cs b/Digipost.Api.Client.Tests/Unittest/DigipostActionTests.cs
index d5f22783..b03ddbe3 100755
--- a/Digipost.Api.Client.Tests/Unittest/DigipostActionTests.cs
+++ b/Digipost.Api.Client.Tests/Unittest/DigipostActionTests.cs
@@ -7,6 +7,7 @@
 using Digipost.Api.Client.Domain.Enums;
 using Digipost.Api.Client.Domain.Exceptions;
 using Digipost.Api.Client.Domain.Identify;
+using Digipost.Api.Client.Domain.SendMessage;
 using Digipost.Api.Client.Domain.Utilities;
 using Digipost.Api.Client.Tests.Integration;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -35,7 +36,7 @@ public void ReturnsCorrectDataForMessage()
                 var clientConfig = new ClientConfig("123");
                 var certificate = TestProperties.Certificate();
                 const string uri = "AFakeUri";
-                var message = DomainUtility.GetSimpleMessage();
+                var message = DomainUtility.GetSimpleMessageWithRecipientById();
 
                 //Act
                 var action = new MessageAction(message, clientConfig, certificate, uri);
@@ -53,7 +54,7 @@ public void ReturnsCorrectDataForIdentification()
                 var clientConfig = new ClientConfig("123");
                 var certificate = TestProperties.Certificate();
                 const string uri = "AFakeUri";
-                var identification = new Identification(IdentificationChoiceType.PersonalidentificationNumber, "00000000000");
+                var identification = new Identification(new RecipientById(IdentificationType.PersonalIdentificationNumber, "00000000000"));
 
                 //Act
                 var action = new IdentificationAction(identification, clientConfig, certificate, uri);
diff --git a/Digipost.Api.Client.Tests/Unittest/DtoTests/DataTransferObjectConverterTests.cs b/Digipost.Api.Client.Tests/Unittest/DtoTests/DataTransferObjectConverterTests.cs
index 03017331..5bb79f1c 100755
--- a/Digipost.Api.Client.Tests/Unittest/DtoTests/DataTransferObjectConverterTests.cs
+++ b/Digipost.Api.Client.Tests/Unittest/DtoTests/DataTransferObjectConverterTests.cs
@@ -10,6 +10,7 @@
 using Digipost.Api.Client.Domain.SendMessage;
 using Digipost.Api.Client.Domain.Utilities;
 using Digipost.Api.Client.Tests.CompareObjects;
+using Digipost.Api.Client.Tests.Integration;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Digipost.Api.Client.Tests.Unittest.DtoTests
@@ -22,27 +23,12 @@ public class DataTransferObjectConverterTests
         [TestClass]
         public class ToDataTransferObjectMethod : DataTransferObjectConverterTests
         {
-            [TestMethod]
-            public void Identification()
-            {
-                //Arrange
-                Identification source = new Identification(IdentificationChoiceType.DigipostAddress, "Ola.Nordmann#244BB2");
-                IdentificationDataTransferObject expectedDto = new IdentificationDataTransferObject(IdentificationChoiceType.DigipostAddress, "Ola.Nordmann#244BB2");
-                
-                //Act
-                var actualDto = DataTransferObjectConverter.ToDataTransferObject(source);
-
-                //Assert
-                IEnumerable<IDifference> differences;
-                _comparator.AreEqual(expectedDto, actualDto, out differences);
-                Assert.AreEqual(0, differences.Count());
-            }
 
             [TestMethod]
             public void IdentificationById()
             {
                 //Arrange
-                IdentificationById source = new IdentificationById(IdentificationType.OrganizationNumber, "123456789");
+                Identification source = new Identification(new RecipientById(IdentificationType.OrganizationNumber, "123456789"));
                 IdentificationDataTransferObject expectedDto = new IdentificationDataTransferObject(IdentificationChoiceType.OrganisationNumber, "123456789");
                 
                 //Act
@@ -57,20 +43,25 @@ public void IdentificationById()
             [TestMethod]
             public void IdentificationByNameAndAddress()
             {
-                //Arrange
-                var recipientByNameAndAddress = new RecipientByNameAndAddress(
-                    fullName: "Ola Nordmann",
-                    postalCode: "0001",
-                    city: "Oslo",
-                    addressLine: "Osloveien 22"
-                    );
-
-                IdentificationByNameAndAddress source = new IdentificationByNameAndAddress(
-                    recipientByNameAndAddress
-                );
+                //Arrange
+                Identification source = new Identification(
+                    new RecipientByNameAndAddress("Ola Nordmann", "Osloveien 22", "0001", "Oslo")
+                    {
+                        AddressLine2 = "Adresselinje2",
+                        BirthDate = DateTime.Today,
+                        PhoneNumber = "123456789",
+                        Email = "tull@epost.no"
+                    }
+                  );
 
                 IdentificationDataTransferObject expectedDto = new IdentificationDataTransferObject(
-                   recipientByNameAndAddress
+                   new RecipientByNameAndAddressDataTranferObject("Ola Nordmann", "0001", "Oslo", "Osloveien 22")
+                    {
+                        AddressLine2 = "Adresselinje2",
+                        BirthDate = DateTime.Today,
+                        PhoneNumber = "123456789",
+                        Email = "tull@epost.no"
+                    }
                );
 
                 //Act
@@ -83,64 +74,65 @@ public void IdentificationByNameAndAddress()
             }
 
             [TestMethod]
-            public void RecipientFromNameAndAddress()
+            public void RecipientByNameAndAddress()
             {
                 //Arrange
-                var recipientByNameAndAddress = new RecipientByNameAndAddress("Ola Nordmann", "0001", "Oslo", "Osloveien 22");
-                IRecipient source = new Recipient(recipientByNameAndAddress);
-                RecipientDataTransferObject expectedDto = new RecipientDataTransferObject(recipientByNameAndAddress);
-                
-                //Act
-                var actualDto = DataTransferObjectConverter.ToDataTransferObject(source);
-                
-                //Assert
-                IEnumerable<IDifference> differences;
-                _comparator.AreEqual(expectedDto, actualDto, out differences);
-                Assert.AreEqual(0, differences.Count());
-            }
+                var birthDate = DateTime.Now;
 
-            [TestMethod]
-            public void RecipientFromPrintDetails()
-            {
-                //Arrange
-                IRecipient source = new Recipient(
-                    new PrintDetails(
-                     new PrintRecipient("Name",
-                         new NorwegianAddress(
-                            "0001", "Oslo", "Addr1", "Addr2", "Addr3")),
-                         new PrintReturnRecipient("Name", new NorwegianAddress(
-                            "0001", "OsloRet", "Addr1Ret", "Addr2Ret", "Addr3Ret"))));
-                
-                var expectedDto = new RecipientDataTransferObject( 
-                    new PrintDetailsDataTransferObject(
-                     new PrintRecipientDataTransferObject("Name", 
-                         new NorwegianAddressDataTransferObject(
-                            "0001", "Oslo", "Addr1", "Addr2", "Addr3")),  
-                         new PrintReturnRecipientDataTransferObject("Name", new NorwegianAddressDataTransferObject(
-                            "0001", "OsloRet", "Addr1Ret", "Addr2Ret", "Addr3Ret"))));
+                var source = new RecipientByNameAndAddress(
+                    fullName: "Ola Nordmann", 
+                    addressLine1: "Biskop Gunnerus Gate 14", 
+                    postalCode: "0001", 
+                    city: "Oslo")
+                {
+                    AddressLine2 = "Etasje 15",
+                    BirthDate = birthDate,
+                    PhoneNumber = "123456789",
+                    Email = "email@test.no"
+                };
+
+                RecipientDataTransferObject expectedDto = new RecipientDataTransferObject(
+                    new RecipientByNameAndAddressDataTranferObject(
+                        fullName:"Ola Nordmann", 
+                        postalCode:"0001", 
+                        city:"Oslo", 
+                        addressLine1:"Biskop Gunnerus Gate 14"
+                        )
+                    {
+                        AddressLine2 = "Etasje 15",
+                        BirthDate = birthDate,
+                        PhoneNumber = "123456789",
+                        Email = "email@test.no"
+                    });
                 
                 //Act
                 var actualDto = DataTransferObjectConverter.ToDataTransferObject(source);
 
-                //Assert
-                IEnumerable<IDifference> differences;
-                _comparator.AreEqual(expectedDto, actualDto, out differences);
-                Assert.AreEqual(0, differences.Count());
+                //Assert
+                IEnumerable<IDifference> differences;
+                _comparator.AreEqual(expectedDto, actualDto, out differences);
+                Assert.AreEqual(0, differences.Count());
             }
 
             [TestMethod]
-            public void RecipientFromIdentification()
+            public void RecipientById()
             {
-                //Arrange
-                IRecipient source = new Recipient(IdentificationChoiceType.DigipostAddress, "ola.nordmann#23FF");
-                RecipientDataTransferObject expectedDto = new RecipientDataTransferObject(IdentificationChoiceType.DigipostAddress, "ola.nordmann#23FF");
+                //Arrange
+                RecipientById source = new RecipientById(
+                    IdentificationType.DigipostAddress,
+                    "ola.nordmann#2233"
+                    );
                 
+                RecipientDataTransferObject expectedDto = new RecipientDataTransferObject(
+                    IdentificationChoiceType.DigipostAddress, 
+                    "ola.nordmann#2233");
+
                 //Act
                 var actualDto = DataTransferObjectConverter.ToDataTransferObject(source);
 
-                //Assert
-                IEnumerable<IDifference> differences;
-                _comparator.AreEqual(expectedDto, actualDto, out differences);
+                //Assert
+                IEnumerable<IDifference> differences;
+                _comparator.AreEqual(expectedDto, actualDto, out differences);
                 Assert.AreEqual(0, differences.Count());
             }
 
@@ -165,41 +157,9 @@ public void Document()
             public void Message()
             {
                 //Arrange
-                var deliverytime = DateTime.Now.AddDays(3);
-                Message source = new Message(
-                    new Recipient(
-                        IdentificationChoiceType.DigipostAddress,
-                        "Ola.Nordmann#34JJ"
-                        ),
-                    new Document("TestSubject", "txt", new byte[3]), "SenderId")
-                {
-                    Attachments = new List<IDocument>()
-                    {
-                        new Document("TestSubject attachment", "txt",  new byte[3])
-                        {
-                            Guid = "attachmentGuid"
-                        }
-                    },
-                    DeliveryTime = deliverytime
-                };
+                var source = DomainUtility.GetMessageWithBytesAndStaticGuidRecipientById();
 
-                MessageDataTransferObject expectedDto = new MessageDataTransferObject(
-                    new RecipientDataTransferObject(
-                        IdentificationChoiceType.DigipostAddress,
-                        "Ola.Nordmann#34JJ"
-                        ),
-                    new DocumentDataTransferObject("TestSubject", "txt", new byte[3]), "SenderId")
-                {
-                    Attachments = new List<DocumentDataTransferObject>
-                    {
-                        new DocumentDataTransferObject("TestSubject attachment", "txt", new byte[3])
-                        {
-                            Guid = "attachmentGuid"
-                        }
-                    },
-                    DeliveryTime = deliverytime,
-                    PrimaryDocumentDataTransferObject = { Guid = source.PrimaryDocument.Guid }
-                };
+                var expectedDto = DomainUtility.GetMessageDataTransferObjectWithBytesAndStaticGuidRecipientById();
 
 
                 //Act
@@ -210,8 +170,54 @@ public void Message()
                 IEnumerable<IDifference> differences;
                 _comparator.AreEqual(expectedDto, actualDto, out differences);
                 Assert.AreEqual(0, differences.Count());
+            }
+
+            [TestMethod]
+            public void MessageWithPrintDetailsAndRecipientById()
+            {
+                //Arrange
+                var printDetails = DomainUtility.GetPrintDetails();
+                var source = DomainUtility.GetMessageWithBytesAndStaticGuidRecipientById();
+                source.PrintDetails = printDetails;
+
+                var expectedDto = DomainUtility.GetMessageDataTransferObjectWithBytesAndStaticGuidRecipientById();
+                expectedDto.RecipientDataTransferObject.PrintDetailsDataTransferObject =
+                    DomainUtility.GetPrintDetailsDataTransferObject();
+
+
+                //Act
+                var actualDto = DataTransferObjectConverter.ToDataTransferObject(source);
+
+                //Assert
+
+                IEnumerable<IDifference> differences;
+                _comparator.AreEqual(expectedDto, actualDto, out differences);
+                Assert.AreEqual(0, differences.Count());
+            }
+
+            [TestMethod]
+            public void MessageWithPrintDetailsAndRecipientByNameAndAddress()
+            {
+                //Arrange
+                var printDetails = DomainUtility.GetPrintDetails();
+                var source = DomainUtility.GetMessageWithBytesAndStaticGuidRecipientByNameAndAddress();
+                source.PrintDetails = printDetails;
+
+                var expectedDto = DomainUtility.GetMessageDataTransferObjectWithBytesAndStaticGuidRecipientNameAndAddress();
+                expectedDto.RecipientDataTransferObject.PrintDetailsDataTransferObject =
+                    DomainUtility.GetPrintDetailsDataTransferObject();
+
+                //Act
+                var actualDto = DataTransferObjectConverter.ToDataTransferObject(source);
+
+                //Assert
+
+                IEnumerable<IDifference> differences;
+                _comparator.AreEqual(expectedDto, actualDto, out differences);
+                Assert.AreEqual(0, differences.Count());
             }
 
+
             [TestMethod]
             public void ForeignAddress()
             {
@@ -370,13 +376,20 @@ public void PrintDetails()
             {
                 //Arrange
                 PrintDetails source = new PrintDetails(
-                    new PrintRecipient("Name", new NorwegianAddress("0001", "Oslo", "Addr1", "Addr2", "Addr3")),
-                    new PrintReturnRecipient("Name", new NorwegianAddress("0001", "OsloRet", "Addr1Ret", "Addr2Ret", "Addr3Ret")));
+                    new PrintRecipient(
+                        "Name", 
+                        new NorwegianAddress("0001", "Oslo", "Addr1", "Addr2", "Addr3")),
+                        new PrintReturnRecipient(
+                            "ReturnName", 
+                            new NorwegianAddress("0001", "OsloRet", "Addr1Ret", "Addr2Ret", "Addr3Ret")));
 
                 var expectedDto = new PrintDetailsDataTransferObject(
-                     new PrintRecipientDataTransferObject("Name", new NorwegianAddressDataTransferObject(
-                        "0001", "Oslo", "Addr1", "Addr2", "Addr3")),  new PrintReturnRecipientDataTransferObject("Name", new NorwegianAddressDataTransferObject(
-                        "0001", "OsloRet", "Addr1Ret", "Addr2Ret", "Addr3Ret")));
+                     new PrintRecipientDataTransferObject(
+                         "Name", 
+                         new NorwegianAddressDataTransferObject("0001", "Oslo", "Addr1", "Addr2", "Addr3")),  
+                         new PrintReturnRecipientDataTransferObject(
+                             "ReturnName", 
+                             new NorwegianAddressDataTransferObject("0001", "OsloRet", "Addr1Ret", "Addr2Ret", "Addr3Ret")));
 
                 //Act
                 var actualDto = DataTransferObjectConverter.ToDataTransferObject(source);
@@ -526,12 +539,13 @@ public void Message()
                 };
                 
                 Message expected = new Message(
-                    new Recipient(
-                        IdentificationChoiceType.DigipostAddress,
+                    new RecipientById(
+                        IdentificationType.DigipostAddress,
                         "Ola.Nordmann#34JJ"
                         ),
-                    new Document("TestSubject", "txt", new byte[3]), "SenderId")
+                    new Document("TestSubject", "txt", new byte[3]))
                 {
+                    SenderId = "SenderId",
                     Attachments = new List<IDocument>()
                     {
                         new Document("TestSubject attachment", "txt",  new byte[3])
diff --git a/Digipost.Api.Client.Tests/Unittest/DtoTests/IdentificationByIdTests.cs b/Digipost.Api.Client.Tests/Unittest/DtoTests/IdentificationByIdTests.cs
deleted file mode 100755
index 52e570cb..00000000
--- a/Digipost.Api.Client.Tests/Unittest/DtoTests/IdentificationByIdTests.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System;
-using System.Linq;
-using Digipost.Api.Client.Domain.Enums;
-using Digipost.Api.Client.Domain.Identify;
-using Digipost.Api.Client.Tests.CompareObjects;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Digipost.Api.Client.Tests.Unittest.DtoTests
-{
-    [TestClass]
-    public class IdentificationByIdTests
-    {
-        Comparator _comparator = new Comparator();
-
-        [TestClass]
-        public class ConstructorMethod : IdentificationByIdTests
-        {
-            [TestMethod]
-            public void SimpleConstructor()
-            {
-                //Arrange
-                IdentificationById identificationById = new IdentificationById(IdentificationType.DigipostAddress, "Digipost-Address");
-
-                //Act
-
-                //Assert
-                Assert.AreEqual(IdentificationType.DigipostAddress, identificationById.IdentificationType);
-                Assert.AreEqual(IdentificationChoiceType.DigipostAddress, identificationById.IdentificationChoiceType);
-                Assert.AreEqual("Digipost-Address", identificationById.Value);
-                Assert.AreEqual("Digipost-Address", identificationById.Data);
-            }
-        }
-
-        [TestClass]
-        public class ParseIdentificationChoiceToIdentificationChoiceTypeMethod : IdentificationByIdTests
-        {
-            [TestMethod]
-            public void ParsesAllEnumValues()
-            {
-                var identificationTypes = Enum.GetValues(typeof (IdentificationType)).Cast<IdentificationType>();
-
-                foreach (var identificationType in identificationTypes)
-                {
-                    //Arrange
-                    IdentificationById identificationById = new IdentificationById(identificationType, "DoesNotMatter");
-
-                    //Act
-                    identificationById.ParseIdentificationChoiceToIdentificationChoiceType();
-
-                    //Assert    
-                    //Will throw exception in Act if failing.
-                }
-            } 
-        }
-    }
-}
diff --git a/Digipost.Api.Client.Tests/Unittest/DtoTests/IdentificationByNameAndAddressTests.cs b/Digipost.Api.Client.Tests/Unittest/DtoTests/IdentificationByNameAndAddressTests.cs
deleted file mode 100755
index ac103acf..00000000
--- a/Digipost.Api.Client.Tests/Unittest/DtoTests/IdentificationByNameAndAddressTests.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Digipost.Api.Client.Domain.Enums;
-using Digipost.Api.Client.Domain.Identify;
-using Digipost.Api.Client.Domain.SendMessage;
-using Digipost.Api.Client.Tests.CompareObjects;
-using Digipost.Api.Client.Tests.Integration;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Digipost.Api.Client.Tests.Unittest.DtoTests
-{
-    [TestClass]
-    public class IdentificationByNameAndAddressTests
-    {
-        [TestClass]
-        public class ConstructorMethod : IdentificationByNameAndAddressTests
-        {
-            Comparator _comparator = new Comparator();
-
-            [TestMethod]
-            public void SimpleConstructor()
-            {
-                //Arrange
-                var recipientByNameAndAddress = DomainUtility.GetRecipientByNameAndAddress();
-                IdentificationByNameAndAddress identificationByNameAndAddress = new IdentificationByNameAndAddress(
-                    recipientByNameAndAddress);
-
-                //Act
-
-                //Assert
-                IEnumerable<IDifference> differences;
-                _comparator.AreEqual(recipientByNameAndAddress, identificationByNameAndAddress.RecipientByNameAndAddress,
-                    out differences);
-                Assert.AreEqual(0, differences.Count());
-            }
-        }
-
-        [TestClass]
-        public class DataMethod : IdentificationByNameAndAddressTests
-        {
-            [TestMethod]
-            public void ReturnsCorrectData()
-            {
-                //Arrange
-                IdentificationByNameAndAddress identificationByNameAndAddress =
-                    new IdentificationByNameAndAddress(DomainUtility.GetRecipientByNameAndAddress());
-
-                //Act
-
-                //Assert
-                Assert.AreSame(identificationByNameAndAddress.Data, identificationByNameAndAddress.RecipientByNameAndAddress);
-            } 
-        }
-
-        [TestClass]
-        public class IdentificationChoiceTypeMethod : IdentificationByNameAndAddressTests
-        {
-            [TestMethod]
-            public void ReturnsNameAndAddress()
-            {
-                //Arrange
-                IdentificationByNameAndAddress identificationByNameAndAddress =
-                   new IdentificationByNameAndAddress(DomainUtility.GetRecipientByNameAndAddress());
-
-                //Act
-
-                //Assert
-                Assert.AreEqual(IdentificationChoiceType.NameAndAddress, identificationByNameAndAddress.IdentificationChoiceType);
-            }
-        }
-
-        
-    }
-}
diff --git a/Digipost.Api.Client.Tests/Unittest/DtoTests/IdentificationResultTests.cs b/Digipost.Api.Client.Tests/Unittest/DtoTests/IdentificationResultTests.cs
index 91cd12c7..79449941 100755
--- a/Digipost.Api.Client.Tests/Unittest/DtoTests/IdentificationResultTests.cs
+++ b/Digipost.Api.Client.Tests/Unittest/DtoTests/IdentificationResultTests.cs
@@ -10,7 +10,7 @@ namespace Digipost.Api.Client.Tests.Unittest.DtoTests
     public class IdentificationResultTests
     {
         [TestClass]
-        public class ConstructorMethod : IdentificationTests
+        public class ConstructorMethod : IdentificationResultTests
         {
             [TestMethod]
             public void SuccessfulIntentificationResultTypeSetsResult()
@@ -26,12 +26,14 @@ public void SuccessfulIntentificationResultTypeSetsResult()
                     if (!failedIdentificationResultType)
                     {
                         //Arrange
-                        IdentificationResult identificationResult = new IdentificationResult(value, "ola.nordmann#2433B");
+                        const string digipostAddress = "ola.nordmann#2433B";
+
+                        IdentificationResult identificationResult = new IdentificationResult(value, digipostAddress);
 
                         //Act
 
                         //Assert
-                        Assert.AreEqual("ola.nordmann#2433B", identificationResult.Data);
+                        Assert.AreEqual(digipostAddress, identificationResult.Data);
                         Assert.IsNull(identificationResult.Error);
                     }
                 }
@@ -41,7 +43,8 @@ public void SuccessfulIntentificationResultTypeSetsResult()
             public void SetsIdentificationResultType()
             {
                 //Arrange
-                IdentificationResult identificationResult = new IdentificationResult(IdentificationResultType.DigipostAddress, "ola.nordmann#2433B");
+                const string digipostAddress = "ola.nordmann#2433B";
+                IdentificationResult identificationResult = new IdentificationResult(IdentificationResultType.DigipostAddress, digipostAddress);
 
                 //Act
 
diff --git a/Digipost.Api.Client.Tests/Unittest/DtoTests/IdentificationTests.cs b/Digipost.Api.Client.Tests/Unittest/DtoTests/IdentificationTests.cs
index afb6dfe5..a52c5c31 100755
--- a/Digipost.Api.Client.Tests/Unittest/DtoTests/IdentificationTests.cs
+++ b/Digipost.Api.Client.Tests/Unittest/DtoTests/IdentificationTests.cs
@@ -1,12 +1,6 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using Digipost.Api.Client.Domain;
-using Digipost.Api.Client.Domain.Enums;
-using Digipost.Api.Client.Domain.Identify;
+using Digipost.Api.Client.Domain.Identify;
 using Digipost.Api.Client.Domain.SendMessage;
-using Digipost.Api.Client.Domain.Utilities;
-using Digipost.Api.Client.Tests.CompareObjects;
+using Digipost.Api.Client.Tests.Integration;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Digipost.Api.Client.Tests.Unittest.DtoTests
@@ -14,39 +8,22 @@ namespace Digipost.Api.Client.Tests.Unittest.DtoTests
     [TestClass]
     public class IdentificationTests
     {
-        public IComparator Comparator = new Comparator();
-
         [TestClass]
         public class ConstructorMethod : IdentificationTests
         {
             [TestMethod]
-            public void InitializeProperlyForStringInitialization()
-            {
-                //Arrange
-                Identification identification = new Identification(IdentificationChoiceType.DigipostAddress, "Ola.nordmann#234HH");
-                
-                //Act
-                
-                //Assert
-                Assert.AreEqual(IdentificationChoiceType.DigipostAddress, identification.IdentificationChoiceType);
-                Assert.AreEqual("Ola.nordmann#234HH", (string) identification.Data);
-            }
-
-            [TestMethod]
-            public void InitializeProperlyForRecipientInitialization()
+            public void SimpleConstructor()
             {
                 //Arrange
-                var recipientByNameAndAddress = new RecipientByNameAndAddress("Ola Nordmann", "0001", "Oslo", "Gateveien 2");
+                var recipientByNameAndAddress = DomainUtility.GetRecipientByNameAndAddress();
                 Identification identification = new Identification(recipientByNameAndAddress);
 
                 //Act
 
                 //Assert
-
-                IEnumerable<IDifference> differences;
-                Comparator.AreEqual(recipientByNameAndAddress, (RecipientByNameAndAddress) identification.Data, out differences);
-                Assert.AreEqual(0, differences.Count());
+                Assert.AreEqual(recipientByNameAndAddress, identification.DigipostRecipient);
             }
         }
+
     }
 }
diff --git a/Digipost.Api.Client.Tests/Unittest/DtoTests/MessageTests.cs b/Digipost.Api.Client.Tests/Unittest/DtoTests/MessageTests.cs
index 91f0837a..965c0bf9 100755
--- a/Digipost.Api.Client.Tests/Unittest/DtoTests/MessageTests.cs
+++ b/Digipost.Api.Client.Tests/Unittest/DtoTests/MessageTests.cs
@@ -1,4 +1,5 @@
 using System;
+using Digipost.Api.Client.Domain.Print;
 using Digipost.Api.Client.Domain.SendMessage;
 using Digipost.Api.Client.Tests.Integration;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -16,7 +17,7 @@ public void ConstructWithRecipientAndPrimaryDocument()
             {
                 //Arrange
                 Message message = new Message(
-                    recipient: DomainUtility.GetRecipientWithDigipostId(), 
+                    digipostRecipient: DomainUtility.GetRecipientByDigipostId(), 
                     primaryDocument: DomainUtility.GetDocument()
                     );                
 
@@ -28,22 +29,25 @@ public void ConstructWithRecipientAndPrimaryDocument()
             }
 
             [TestMethod]
-            public void ConstructWithSenderId()
+            public void ConstructWithRecipientByIdAndPrintDetailsMethod()
             {
                 //Arrange
-                Message message = new Message(
-                    recipient: DomainUtility.GetRecipientWithDigipostId(),
-                    primaryDocument: DomainUtility.GetDocument(),
-                    senderId: "123456"
-                );                
+                var recipient = DomainUtility.GetRecipientByDigipostId();
+                var document = DomainUtility.GetDocument();
+                var printDetails = DomainUtility.GetPrintDetails();
                 
+                Message message = new Message(
+                    digipostRecipient: recipient, 
+                    primaryDocument: document
+                    );
+                message.PrintDetails = printDetails;
+
                 //Act
 
                 //Assert
-                Assert.IsNotNull(message.PrimaryDocument);
-                Assert.IsNotNull(message.SenderId);
-                Assert.IsNotNull(message.Attachments);
-                Assert.AreEqual("123456",message.SenderId);
+                Assert.AreEqual(recipient, message.DigipostRecipient);
+                Assert.AreEqual(document, message.PrimaryDocument);
+                Assert.AreEqual(printDetails, message.PrintDetails);
             }
         }
 
@@ -55,7 +59,7 @@ public void DeliveryTimeNotSpecifiedGivesFalse()
             {
                 //Arrange
                 Message message = new Message(
-                    recipient: DomainUtility.GetRecipientWithDigipostId(),
+                    digipostRecipient: DomainUtility.GetRecipientByDigipostId(),
                     primaryDocument: DomainUtility.GetDocument()
                     );               
                 
@@ -70,10 +74,9 @@ public void DeliveryTimeSpecifiedGivesTrue()
             {
                 //Arrange
                 Message message = new Message(
-                    recipient: DomainUtility.GetRecipientWithDigipostId(),
+                    digipostRecipient: DomainUtility.GetRecipientByDigipostId(),
                     primaryDocument: DomainUtility.GetDocument()
-                    );
-                message.DeliveryTime = DateTime.Today;
+                    ) {DeliveryTime = DateTime.Today};
 
                 //Act
 
diff --git a/Digipost.Api.Client.Tests/Unittest/DtoTests/PrintReturnRecipientTests.cs b/Digipost.Api.Client.Tests/Unittest/DtoTests/PrintReturnRecipientTests.cs
index 3b7924d9..5eb7c571 100755
--- a/Digipost.Api.Client.Tests/Unittest/DtoTests/PrintReturnRecipientTests.cs
+++ b/Digipost.Api.Client.Tests/Unittest/DtoTests/PrintReturnRecipientTests.cs
@@ -19,12 +19,14 @@ public class ConstructorMethod : PrintRecipientTests
             public void SimpleConstructor()
             {
                 //Arrange
-                PrintRecipient printRecipient = new PrintRecipient("name", DomainUtility.GetNorwegianAddress());
+                const string name = "name";
+
+                PrintRecipient printRecipient = new PrintRecipient(name, DomainUtility.GetNorwegianAddress());
 
                 //Act
 
                 //Assert
-                Assert.AreEqual("name", printRecipient.Name);
+                Assert.AreEqual(name, printRecipient.Name);
 
                 IEnumerable<IDifference> differences;
                 _comparator.AreEqual(DomainUtility.GetNorwegianAddress(), printRecipient.Address, out differences);
diff --git a/Digipost.Api.Client.Tests/Unittest/DtoTests/RecipientByIdTests.cs b/Digipost.Api.Client.Tests/Unittest/DtoTests/RecipientByIdTests.cs
new file mode 100755
index 00000000..2126f485
--- /dev/null
+++ b/Digipost.Api.Client.Tests/Unittest/DtoTests/RecipientByIdTests.cs
@@ -0,0 +1,32 @@
+using Digipost.Api.Client.Domain.Enums;
+using Digipost.Api.Client.Domain.SendMessage;
+using Digipost.Api.Client.Tests.Integration;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Digipost.Api.Client.Tests.Unittest.DtoTests
+{
+    [TestClass]
+    public class RecipientByIdTests
+    {
+        [TestClass]
+        public class ConstructorMethod : RecipientByIdTests
+        {
+            [TestMethod]
+            public void SimpleConstructor()
+            {
+                //Arrange
+                const string testPerson = "ola.nordmann#2233";
+
+                RecipientById recipientById = new RecipientById(
+                    IdentificationType.DigipostAddress, 
+                    testPerson);
+
+                //Act
+
+                //Assert
+                Assert.AreEqual(IdentificationType.DigipostAddress, recipientById.IdentificationType);
+                Assert.AreEqual(testPerson, recipientById.Id);
+            } 
+        }
+    }
+}
diff --git a/Digipost.Api.Client.Tests/Unittest/DtoTests/RecipientByNameAndAddressTests.cs b/Digipost.Api.Client.Tests/Unittest/DtoTests/RecipientByNameAndAddressTests.cs
new file mode 100755
index 00000000..474e5f84
--- /dev/null
+++ b/Digipost.Api.Client.Tests/Unittest/DtoTests/RecipientByNameAndAddressTests.cs
@@ -0,0 +1,41 @@
+using System.Collections.Generic;
+using System.Linq;
+using Digipost.Api.Client.Domain.Enums;
+using Digipost.Api.Client.Domain.Print;
+using Digipost.Api.Client.Domain.SendMessage;
+using Digipost.Api.Client.Tests.CompareObjects;
+using Digipost.Api.Client.Tests.Integration;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Digipost.Api.Client.Tests.Unittest.DtoTests
+{
+    [TestClass]
+    public class RecipientByNameAndAddressTests
+    {
+        [TestClass]
+        public class ConstructorMethod : RecipientByNameAndAddressTests
+        {
+            Comparator _comparator = new Comparator();
+
+            [TestMethod]
+            public void SimpleConstructor()
+            {
+                //Arrange
+                const string fullName = "Ola Nordmann";
+                const string addressLine1 = "Biskop Gunnerus Gate 14";
+                const string postalCode = "0001";
+                const string city = "Oslo";
+
+                RecipientByNameAndAddress recipientByNameAndAddress = new RecipientByNameAndAddress(fullName, addressLine1, postalCode, city);
+
+                //Act
+
+                //Assert
+                Assert.AreEqual(fullName, recipientByNameAndAddress.FullName);
+                Assert.AreEqual(postalCode, recipientByNameAndAddress.PostalCode);
+                Assert.AreEqual(city, recipientByNameAndAddress.City);
+                Assert.AreEqual(addressLine1, recipientByNameAndAddress.AddressLine1);
+            }
+        }
+    }
+}
diff --git a/Digipost.Api.Client.Tests/Unittest/DtoTests/RecipientTests.cs b/Digipost.Api.Client.Tests/Unittest/DtoTests/RecipientTests.cs
deleted file mode 100755
index d9b70ecc..00000000
--- a/Digipost.Api.Client.Tests/Unittest/DtoTests/RecipientTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Digipost.Api.Client.Domain;
-using Digipost.Api.Client.Domain.Enums;
-using Digipost.Api.Client.Domain.SendMessage;
-using Digipost.Api.Client.Tests.CompareObjects;
-using Digipost.Api.Client.Tests.Integration;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Digipost.Api.Client.Tests.Unittest.DtoTests
-{
-    [TestClass]
-    public class RecipientTests
-    {
-        readonly Comparator _comparator = new Comparator();
-
-        [TestClass]
-        public class ConstructorMethod : RecipientTests
-        {
-            [TestMethod]
-            public void ConstructWithRecipientByNameAndAddress()
-            {
-                //Arrange
-
-                var recipientByNameAndAddress = new RecipientByNameAndAddress("Ola Nordmann","0001", "Oslo", "Osloveien 22");
-                var printDetails = DomainUtility.GetPrintDetails();
-                Recipient recipientDataTransferObject = new Recipient(
-                    recipientByNameAndAddress, printDetails);
-
-                //Act
-
-                //Assert
-                IEnumerable<IDifference> recipientDifferences;
-                _comparator.AreEqual(recipientByNameAndAddress, recipientDataTransferObject.IdentificationValue, out recipientDifferences);
-                Assert.AreEqual(0,recipientDifferences.Count());
-
-                IEnumerable<IDifference> printDifferences;
-                _comparator.AreEqual(printDetails, recipientDataTransferObject.PrintDetails, out printDifferences);
-                Assert.AreEqual(0, printDifferences.Count());
-            }
-
-            [TestMethod]
-            public void ConstructWithIdentificationChoiceType()
-            {
-                //Arrange
-                var printDetails = DomainUtility.GetPrintDetails();
-                var recipient = new Recipient(IdentificationChoiceType.DigipostAddress, "ola.nordmann#24HH", printDetails);
-
-                //Act
-
-                //Assert
-                Assert.AreEqual("ola.nordmann#24HH", recipient.IdentificationValue as string);
-                Assert.AreEqual(IdentificationChoiceType.DigipostAddress, recipient.IdentificationType);
-                Assert.IsNotNull(recipient.PrintDetails);
-
-                IEnumerable<IDifference> printDifferences;
-                _comparator.AreEqual(printDetails, recipient.PrintDetails, out printDifferences);
-                Assert.AreEqual(0, printDifferences.Count());
-            }
-
-            [TestMethod]
-            public void ConstructWithOnlyPrintDetails()
-            {
-                //Arrange
-                var printDetails = DomainUtility.GetPrintDetails();
-                var recipient = new Recipient(printDetails);
-
-                //Act
-
-                //Assert
-                IEnumerable<IDifference> printDifferences;
-                _comparator.AreEqual(printDetails, recipient.PrintDetails, out printDifferences);
-                Assert.AreEqual(0, printDifferences.Count());
-                Assert.IsNull(recipient.IdentificationType);
-            }
-        }
-
-        
-    }
-}
diff --git a/Digipost.Api.Client.Tests/Unittest/SerializeUtilTests.cs b/Digipost.Api.Client.Tests/Unittest/SerializeUtilTests.cs
index 74588ef4..12e45823 100755
--- a/Digipost.Api.Client.Tests/Unittest/SerializeUtilTests.cs
+++ b/Digipost.Api.Client.Tests/Unittest/SerializeUtilTests.cs
@@ -27,7 +27,7 @@ public void ReturnsProperDeserializedMessageWithInvoice()
                 var printDetails = new PrintDetailsDataTransferObject(new PrintRecipientDataTransferObject("Ola Nordmann", new NorwegianAddressDataTransferObject("0460", "Oslo", "Collettsgate 68", "Leil h401", "dør 2")), new PrintReturnRecipientDataTransferObject("Ola Digipost", new ForeignAddressDataTransferObject(CountryIdentifier.Country, "SE", "svenskegatan 1", " leil h101", "pb 12", "skuff 3")));
                 var recipient =
                     new RecipientDataTransferObject(
-                        new RecipientByNameAndAddress("Ola Nordmann", "0460", "Oslo", "Colletts gate 68"), printDetails);
+                        new RecipientByNameAndAddressDataTranferObject("Ola Nordmann", "0460", "Oslo", "Colletts gate 68"), printDetails);
                 var document = new DocumentDataTransferObject("Subject", "txt", ByteUtility.GetBytes("test"), AuthenticationLevel.TwoFactor,
                     SensitivityLevel.Sensitive) { Guid = "1222222", SmsNotification = new SmsNotificationDataTransferObject(2) };
 
@@ -54,7 +54,7 @@ public void ReturnProperDeserializedMessageWithDeliveryTime()
                 //Arrange
                 const string messageWithDeliverytimeBlueprint = @"<?xml version=""1.0"" encoding=""utf-8""?><message xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xmlns:xsd=""http://www.w3.org/2001/XMLSchema"" xmlns=""http://api.digipost.no/schema/v6""><recipient><personal-identification-number>00000000000</personal-identification-number></recipient><delivery-time>2015-07-27T00:00:00</delivery-time><primary-document><uuid>786711a5-1ed6-4f7c-8eda-a5b762c446cb</uuid><subject>Integrasjonstjest</subject><file-type>txt</file-type><authentication-level>PASSWORD</authentication-level><sensitivity-level>NORMAL</sensitivity-level></primary-document></message>";
 
-                var messageWithDeliverytime = DomainUtility.GetSimpleMessage();
+                var messageWithDeliverytime = DomainUtility.GetSimpleMessageWithRecipientById();
                 messageWithDeliverytime.PrimaryDocument.Guid = "786711a5-1ed6-4f7c-8eda-a5b762c446cb"; //To ensure that the guid is the same as in the blueprint
                 messageWithDeliverytime.DeliveryTime = new DateTime(2015, 07, 27);
                 messageWithDeliverytime.PrimaryDocument.ContentBytes = null;
@@ -75,7 +75,7 @@ public void ReturnsProperDeserializedMessageWithSenderOrganizationId()
                 var printDetails = new PrintDetailsDataTransferObject(new PrintRecipientDataTransferObject("Ola Nordmann", new NorwegianAddressDataTransferObject("0460", "Oslo", "Collettsgate 68", "Leil h401", "dør 2")), new PrintReturnRecipientDataTransferObject("Ola Digipost", new ForeignAddressDataTransferObject(CountryIdentifier.Country, "SE", "svenskegatan 1", " leil h101", "pb 12", "skuff 3")));
                 var recipient =
                     new RecipientDataTransferObject(
-                        new RecipientByNameAndAddress("Ola Nordmann", "0460", "Oslo", "Colletts gate 68"), printDetails);
+                        new RecipientByNameAndAddressDataTranferObject("Ola Nordmann", "0460", "Oslo", "Colletts gate 68"), printDetails);
                 var document = new DocumentDataTransferObject("Subject", "txt", ByteUtility.GetBytes("test"), AuthenticationLevel.TwoFactor,
                     SensitivityLevel.Sensitive) { Guid = "1222222", SmsNotification = new SmsNotificationDataTransferObject(2) };
 
@@ -113,7 +113,7 @@ public void ReturnProperDerializedRecipient()
                 var printDetails = new PrintDetailsDataTransferObject(new PrintRecipientDataTransferObject("Ola Nordmann", new NorwegianAddressDataTransferObject("0460", "Oslo", "Collettsgate 68", "Leil h401", "dør 2")), new PrintReturnRecipientDataTransferObject("Ola Digipost", new ForeignAddressDataTransferObject(CountryIdentifier.Country, "SE", "svenskegatan 1", " leil h101", "pb 12", "skuff 3")));
                 var recipient =
                     new RecipientDataTransferObject(
-                        new RecipientByNameAndAddress("Ola Nordmann", "0460", "Oslo", "Colletts gate 68"), printDetails);
+                        new RecipientByNameAndAddressDataTranferObject("Ola Nordmann", "0460", "Oslo", "Colletts gate 68"), printDetails);
 
                 //Act
                 var deserializedRecipientBlueprint = SerializeUtil.Deserialize<RecipientDataTransferObject>(recipientBlueprint);
@@ -128,7 +128,7 @@ public void ReturnsProperDeserializedIdentificationByNameAndAddress()
             {
                 //Arrange
                 const string identificationBlueprint = @"<?xml version=""1.0"" encoding=""utf-8""?><identification xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xmlns:xsd=""http://www.w3.org/2001/XMLSchema"" xmlns=""http://api.digipost.no/schema/v6""><name-and-address><fullname>Ola Nordmann</fullname><addressline1>Postgirobygget 16</addressline1><postalcode>0001</postalcode><city>Oslo</city></name-and-address></identification>";
-                var identification = new IdentificationDataTransferObject(new RecipientByNameAndAddress("Ola Nordmann", "0001", "Oslo", "Postgirobygget 16"));
+                var identification = new IdentificationDataTransferObject(new RecipientByNameAndAddressDataTranferObject("Ola Nordmann", "0001", "Oslo", "Postgirobygget 16"));
 
                 //Act
                 var deserializedIdentificationBlueprint = SerializeUtil.Deserialize<IdentificationDataTransferObject>(identificationBlueprint);
@@ -216,7 +216,7 @@ public void ReturnProperSerializedMessageWithInvoice()
                 var printDetails = new PrintDetailsDataTransferObject(new PrintRecipientDataTransferObject("Ola Nordmann", new NorwegianAddressDataTransferObject("0460", "Oslo", "Collettsgate 68", "Leil h401", "dør 2")), new PrintReturnRecipientDataTransferObject("Ola Digipost", new ForeignAddressDataTransferObject(CountryIdentifier.Country, "SE", "svenskegatan 1", " leil h101", "pb 12", "skuff 3")));
                 var recipient =
                     new RecipientDataTransferObject(
-                        new RecipientByNameAndAddress("Ola Nordmann", "0460", "Oslo", "Colletts gate 68"), printDetails);
+                        new RecipientByNameAndAddressDataTranferObject("Ola Nordmann", "0460", "Oslo", "Colletts gate 68"), printDetails);
                 var document = new DocumentDataTransferObject("Subject", "txt", ByteUtility.GetBytes("test"), AuthenticationLevel.TwoFactor,
                     SensitivityLevel.Sensitive) { SmsNotification = new SmsNotificationDataTransferObject(2), Guid = "03fdf738-5c7e-420d-91e2-2b95e025d635" };
                 var attachment = new DocumentDataTransferObject("attachment", "txt", ByteUtility.GetBytes("test"), AuthenticationLevel.TwoFactor,
@@ -241,7 +241,7 @@ public void ReturnsProperSerializedMessageWithSenderOrganizationId()
                 var printDetails = new PrintDetailsDataTransferObject(new PrintRecipientDataTransferObject("Ola Nordmann", new NorwegianAddressDataTransferObject("0460", "Oslo", "Collettsgate 68", "Leil h401", "dør 2")), new PrintReturnRecipientDataTransferObject("Ola Digipost", new ForeignAddressDataTransferObject(CountryIdentifier.Country, "SE", "svenskegatan 1", " leil h101", "pb 12", "skuff 3")));
                 var recipient =
                     new RecipientDataTransferObject(
-                        new RecipientByNameAndAddress("Ola Nordmann", "0460", "Oslo", "Colletts gate 68"), printDetails);
+                        new RecipientByNameAndAddressDataTranferObject("Ola Nordmann", "0460", "Oslo", "Colletts gate 68"), printDetails);
                 var document = new DocumentDataTransferObject("Subject", "txt", ByteUtility.GetBytes("test"), AuthenticationLevel.TwoFactor,
                     SensitivityLevel.Sensitive) { Guid = "1222222", SmsNotification = new SmsNotificationDataTransferObject(2) };
 
@@ -259,9 +259,9 @@ public void ReturnsProperSerializedMessageWithSenderOrganizationId()
             public void ReturnProperSerializedMessageWithDeliveryTime()
             {
                 //Arrange
-                const string messageWithDeliverytimeBlueprint = @"<?xml version=""1.0"" encoding=""utf-8""?><message xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xmlns:xsd=""http://www.w3.org/2001/XMLSchema"" xmlns=""http://api.digipost.no/schema/v6""><recipient><personal-identification-number>00000000000</personal-identification-number></recipient><delivery-time>2015-07-27T00:00:00</delivery-time><primary-document><uuid>786711a5-1ed6-4f7c-8eda-a5b762c446cb</uuid><subject>Integrasjonstjest</subject><file-type>txt</file-type><authentication-level>PASSWORD</authentication-level><sensitivity-level>NORMAL</sensitivity-level></primary-document></message>";
-
-                var simpleMessage = DomainUtility.GetSimpleMessage();
+                const string messageWithDeliverytimeBlueprint = @"<?xml version=""1.0"" encoding=""utf-8""?><message xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xmlns:xsd=""http://www.w3.org/2001/XMLSchema"" xmlns=""http://api.digipost.no/schema/v6""><recipient><personal-identification-number>00000000000</personal-identification-number></recipient><delivery-time>2015-07-27T00:00:00</delivery-time><primary-document><uuid>786711a5-1ed6-4f7c-8eda-a5b762c446cb</uuid><subject>Integrasjonstjest</subject><file-type>txt</file-type><authentication-level>PASSWORD</authentication-level><sensitivity-level>NORMAL</sensitivity-level></primary-document></message>";
+
+                var simpleMessage = DomainUtility.GetSimpleMessageWithRecipientById();
                 simpleMessage.PrimaryDocument.Guid = "786711a5-1ed6-4f7c-8eda-a5b762c446cb"; //To ensure that the guid is the same as in the blueprint
                 var messageWithDeliverytime = DataTransferObjectConverter.ToDataTransferObject(simpleMessage);
                 messageWithDeliverytime.DeliveryTime = new DateTime(2015, 07, 27);
@@ -298,7 +298,7 @@ public void ReturnProperSerializedRecipient()
                 var printDetails = new PrintDetailsDataTransferObject(new PrintRecipientDataTransferObject("Ola Nordmann", new NorwegianAddressDataTransferObject("0460", "Oslo", "Collettsgate 68", "Leil h401", "dør 2")), new PrintReturnRecipientDataTransferObject("Ola Digipost", new ForeignAddressDataTransferObject(CountryIdentifier.Country, "SE", "svenskegatan 1", " leil h101", "pb 12", "skuff 3")));
                 var recipient =
                     new RecipientDataTransferObject(
-                        new RecipientByNameAndAddress("Ola Nordmann", "0460", "Oslo", "Colletts gate 68"), printDetails);
+                        new RecipientByNameAndAddressDataTranferObject("Ola Nordmann", "0460", "Oslo", "Colletts gate 68"), printDetails);
 
                 //Act
                 var serialized = SerializeUtil.Serialize(recipient);
@@ -314,7 +314,7 @@ public void ReturnsProperSerializedIdentificationByNameAndAddress()
             {
                 //Arrange
                 const string identificationBlueprint = @"<?xml version=""1.0"" encoding=""utf-8""?><identification xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xmlns:xsd=""http://www.w3.org/2001/XMLSchema"" xmlns=""http://api.digipost.no/schema/v6""><name-and-address><fullname>Ola Nordmann</fullname><addressline1>Postgirobygget 16</addressline1><postalcode>0001</postalcode><city>Oslo</city></name-and-address></identification>";
-                var identification = new IdentificationDataTransferObject(new RecipientByNameAndAddress("Ola Nordmann", "0001", "Oslo", "Postgirobygget 16"));
+                var identification = new IdentificationDataTransferObject(new RecipientByNameAndAddressDataTranferObject("Ola Nordmann", "0001", "Oslo", "Postgirobygget 16"));
 
                 //Act
                 var serializedIdentificationBlueprint = SerializeUtil.Serialize(identification);
diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs
index 2d9d8850..6b8abccc 100755
--- a/SharedAssemblyInfo.cs
+++ b/SharedAssemblyInfo.cs
@@ -7,5 +7,5 @@
 //      Build Number
 //      Revision
 
-[assembly: AssemblyVersion("6.1.*")]
-[assembly: AssemblyFileVersion("6.1.*")]
\ No newline at end of file
+[assembly: AssemblyVersion("6.2.*")]
+[assembly: AssemblyFileVersion("6.2.*")]
\ No newline at end of file