diff --git a/VisualCard.Tests/ContactData.cs b/VisualCard.Tests/ContactData.cs
index 794cfe0..80941b3 100644
--- a/VisualCard.Tests/ContactData.cs
+++ b/VisualCard.Tests/ContactData.cs
@@ -44,41 +44,15 @@ public static class ContactData
         private static readonly Card singleVcardTwoContactShortInstance = new
         (
             null,
-            "2.1",
-            new NameInfo[]
-            { 
-                new NameInfo(0, Array.Empty<string>(), "Rick", "Hood", Array.Empty<string>(), Array.Empty<string>(), Array.Empty<string>()) 
-            },
-            "Rick Hood",
-            Array.Empty<TelephoneInfo>(),
-            Array.Empty<AddressInfo>(),
-            Array.Empty<OrganizationInfo>(),
-            Array.Empty<TitleInfo>(),
-            "",
-            "",
-            Array.Empty<EmailInfo>(),
-            Array.Empty<XNameInfo>(),
-            "individual",
-            Array.Empty<PhotoInfo>(),
-            default,
-            Array.Empty<NicknameInfo>(),
-            default(DateTime),
-            "",
-            Array.Empty<RoleInfo>(),
-            Array.Empty<string>(),
-            Array.Empty<LogoInfo>(),
-            "",
-            "",
-            Array.Empty<Parts.TimeZoneInfo>(),
-            Array.Empty<GeoInfo>(),
-            Array.Empty<SoundInfo>(),
-            Array.Empty<ImppInfo>(),
-            "",
-            "",
-            "",
-            "",
-            ""
-        );
+            "2.1"
+        )
+        {
+            ContactNames = new NameInfo[]
+            {
+                new NameInfo(0, Array.Empty<string>(), "Rick", "Hood", Array.Empty<string>(), Array.Empty<string>(), Array.Empty<string>())
+            },
+            ContactFullName = "Rick Hood"
+        };
         #endregion
 
         #region singleVcardThreeContactShort
@@ -95,41 +69,15 @@ public static class ContactData
         private static readonly Card singleVcardThreeContactShortInstance = new
         (
             null,
-            "3.0",
-            new NameInfo[]
-            { 
+            "3.0"
+        )
+        {
+            ContactNames = new NameInfo[]
+            {
                 new NameInfo(0, Array.Empty<string>(), "Rick", "Hood", Array.Empty<string>(), Array.Empty<string>(), Array.Empty<string>())
             },
-            "Rick Hood",
-            Array.Empty<TelephoneInfo>(),
-            Array.Empty<AddressInfo>(),
-            Array.Empty<OrganizationInfo>(),
-            Array.Empty<TitleInfo>(),
-            "",
-            "",
-            Array.Empty<EmailInfo>(),
-            Array.Empty<XNameInfo>(),
-            "individual",
-            Array.Empty<PhotoInfo>(),
-            default,
-            Array.Empty<NicknameInfo>(),
-            default(DateTime),
-            "",
-            Array.Empty<RoleInfo>(),
-            Array.Empty<string>(),
-            Array.Empty<LogoInfo>(),
-            "",
-            "",
-            Array.Empty<Parts.TimeZoneInfo>(),
-            Array.Empty<GeoInfo>(),
-            Array.Empty<SoundInfo>(),
-            Array.Empty<ImppInfo>(),
-            "",
-            "",
-            "",
-            "",
-            ""
-        );
+            ContactFullName = "Rick Hood"
+        };
         #endregion
 
         #region singleVcardFourContactShort
@@ -146,41 +94,15 @@ public static class ContactData
         private static readonly Card singleVcardFourContactShortInstance = new
         (
             null,
-            "4.0",
-            new NameInfo[]
+            "4.0"
+        )
+        {
+            ContactNames = new NameInfo[]
             {
                 new NameInfo(0, Array.Empty<string>(), "Rick", "Hood", Array.Empty<string>(), Array.Empty<string>(), Array.Empty<string>())
             },
-            "Rick Hood",
-            Array.Empty<TelephoneInfo>(),
-            Array.Empty<AddressInfo>(),
-            Array.Empty<OrganizationInfo>(),
-            Array.Empty<TitleInfo>(),
-            "",
-            "",
-            Array.Empty<EmailInfo>(),
-            Array.Empty<XNameInfo>(),
-            "individual",
-            Array.Empty<PhotoInfo>(),
-            default,
-            Array.Empty<NicknameInfo>(),
-            default(DateTime),
-            "",
-            Array.Empty<RoleInfo>(),
-            Array.Empty<string>(),
-            Array.Empty<LogoInfo>(),
-            "",
-            "",
-            Array.Empty<Parts.TimeZoneInfo>(),
-            Array.Empty<GeoInfo>(),
-            Array.Empty<SoundInfo>(),
-            Array.Empty<ImppInfo>(),
-            "",
-            "",
-            "",
-            "",
-            ""
-        );
+            ContactFullName = "Rick Hood"
+        };
         #endregion
 
         #region singleVcardTwoContact
@@ -207,62 +129,43 @@ public static class ContactData
         private static readonly Card singleVcardTwoContactInstance = new
         (
             null,
-            "2.1",
-            new NameInfo[]
+            "2.1"
+        )
+        {
+            ContactNames = new NameInfo[]
             {
                 new NameInfo(0, Array.Empty<string>(), "John", "Sanders", Array.Empty<string>(), Array.Empty<string>(), Array.Empty<string>())
             },
-            "John Sanders",
-            new TelephoneInfo[]
+            ContactFullName = "John Sanders",
+            ContactTelephones = new TelephoneInfo[]
             {
                 new TelephoneInfo(0, Array.Empty<string>(), new string[] { "CELL" }, "495-522-3560")
             },
-            new AddressInfo[]
+            ContactAddresses = new AddressInfo[]
             {
                 new AddressInfo(0, Array.Empty<string>(), new string[] { "HOME" }, "", "", "Los Angeles, USA", "", "", "", "")
-            }, 
-            new OrganizationInfo[]
+            },
+            ContactOrganizations = new OrganizationInfo[]
             {
                 new OrganizationInfo(0, Array.Empty<string>(), "Acme Co.", "", "", new string[] { "WORK" })
             },
-            new TitleInfo[]
+            ContactTitles = new TitleInfo[]
             {
                 new TitleInfo(0, Array.Empty<string>(), "Product Manager")
             },
-            "",
-            "Note test for VisualCard",
-            new EmailInfo[]
+            ContactNotes = "Note test for VisualCard",
+            ContactMails = new EmailInfo[]
             {
                 new EmailInfo(0, Array.Empty<string>(), new string[] { "HOME" }, "john.s@acme.co")
             },
-            new XNameInfo[]
+            ContactXNames = new XNameInfo[]
             {
                 new XNameInfo(0, Array.Empty<string>(), "PHONETIC-FIRST-NAME", new string[] { "Saunders" }, Array.Empty<string>()),
                 new XNameInfo(0, Array.Empty<string>(), "PHONETIC-LAST-NAME",  new string[] { "John" }, Array.Empty<string>()),
                 new XNameInfo(0, Array.Empty<string>(), "ANDROID-CUSTOM", new string[] { "vnd.android.cursor.item/nickname", "JS", "1", "", "", "", "", "", "", "", "", "", "", "", "", "" }, Array.Empty<string>()),
                 new XNameInfo(0, Array.Empty<string>(), "AIM", new string[] { "john.s" }, Array.Empty<string>()),
-            },
-            "individual",
-            Array.Empty<PhotoInfo>(),
-            default,
-            Array.Empty<NicknameInfo>(),
-            default(DateTime),
-            "",
-            Array.Empty<RoleInfo>(),
-            Array.Empty<string>(),
-            Array.Empty<LogoInfo>(),
-            "",
-            "",
-            Array.Empty<Parts.TimeZoneInfo>(),
-            Array.Empty<GeoInfo>(),
-            Array.Empty<SoundInfo>(),
-            Array.Empty<ImppInfo>(),
-            "",
-            "",
-            "",
-            "",
-            ""
-        );
+            }
+        };
         #endregion
 
         #region singleVcardThreeContact
@@ -289,64 +192,46 @@ public static class ContactData
         private static readonly Card singleVcardThreeContactInstance = new
         (
             null,
-            "3.0",
-            new NameInfo[]
+            "3.0"
+        )
+        {
+            ContactNames = new NameInfo[]
             {
                 new NameInfo(0, Array.Empty<string>(), "John", "Sanders", Array.Empty<string>(), Array.Empty<string>(), Array.Empty<string>())
             },
-            "John Sanders",
-            new TelephoneInfo[]
+            ContactFullName = "John Sanders",
+            ContactTelephones = new TelephoneInfo[]
             {
                 new TelephoneInfo(0, Array.Empty<string>(), new string[] { "cell" }, "495-522-3560")
             },
-            new AddressInfo[]
+            ContactAddresses = new AddressInfo[]
             {
                 new AddressInfo(0, Array.Empty<string>(), new string[] { "home" }, "", "", "Los Angeles, USA", "", "", "", "")
             },
-            new OrganizationInfo[]
+            ContactOrganizations = new OrganizationInfo[]
             {
                 new OrganizationInfo(0, Array.Empty<string>(), "Acme Co.", "", "", new string[] { "WORK" })
             },
-            new TitleInfo[]
+            ContactTitles = new TitleInfo[]
             {
                 new TitleInfo(0, Array.Empty<string>(), "Product Manager")
             },
-            "",
-            "Note test for VisualCard",
-            new EmailInfo[]
+            ContactNotes = "Note test for VisualCard",
+            ContactMails = new EmailInfo[]
             {
                 new EmailInfo(0, Array.Empty<string>(), new string[] { "home" }, "john.s@acme.co")
             },
-            new XNameInfo[]
+            ContactXNames = new XNameInfo[]
             {
                 new XNameInfo(0, Array.Empty<string>(), "PHONETIC-FIRST-NAME", new string[] { "Saunders" }, Array.Empty<string>()),
                 new XNameInfo(0, Array.Empty<string>(), "PHONETIC-LAST-NAME",  new string[] { "John" }, Array.Empty<string>()),
                 new XNameInfo(0, Array.Empty<string>(), "AIM", new string[] { "john.s" }, Array.Empty<string>()),
             },
-            "individual",
-            Array.Empty<PhotoInfo>(),
-            default,
-            new NicknameInfo[]
+            ContactNicknames = new NicknameInfo[]
             {
                 new NicknameInfo(0, Array.Empty<string>(), "JS", new string[] { "HOME" })
-            },
-            default(DateTime),
-            "",
-            Array.Empty<RoleInfo>(),
-            Array.Empty<string>(),
-            Array.Empty<LogoInfo>(),
-            "",
-            "",
-            Array.Empty<Parts.TimeZoneInfo>(),
-            Array.Empty<GeoInfo>(),
-            Array.Empty<SoundInfo>(),
-            Array.Empty<ImppInfo>(),
-            "",
-            "",
-            "",
-            "",
-            ""
-        );
+            }
+        };
         #endregion
 
         #region singleVcardFourContact
@@ -373,64 +258,46 @@ public static class ContactData
         private static readonly Card singleVcardFourContactInstance = new
         (
             null,
-            "4.0",
-            new NameInfo[]
+            "4.0"
+        )
+        {
+            ContactNames = new NameInfo[]
             {
                 new NameInfo(0, Array.Empty<string>(), "John", "Sanders", Array.Empty<string>(), Array.Empty<string>(), Array.Empty<string>())
             },
-            "John Sanders",
-            new TelephoneInfo[]
+            ContactFullName = "John Sanders",
+            ContactTelephones = new TelephoneInfo[]
             {
                 new TelephoneInfo(0, Array.Empty<string>(), new string[] { "cell" }, "495-522-3560")
             },
-            new AddressInfo[]
+            ContactAddresses = new AddressInfo[]
             {
                 new AddressInfo(0, Array.Empty<string>(), new string[] { "home" }, "", "", "Los Angeles, USA", "", "", "", "")
             },
-            new OrganizationInfo[]
+            ContactOrganizations = new OrganizationInfo[]
             {
                 new OrganizationInfo(0, Array.Empty<string>(), "Acme Co.", "", "", new string[] { "WORK" })
             },
-            new TitleInfo[]
+            ContactTitles = new TitleInfo[]
             {
                 new TitleInfo(0, Array.Empty<string>(), "Product Manager")
             },
-            "",
-            "Note test for VisualCard",
-            new EmailInfo[]
+            ContactNotes = "Note test for VisualCard",
+            ContactMails = new EmailInfo[]
             {
                 new EmailInfo(0, Array.Empty<string>(), new string[] { "HOME" }, "john.s@acme.co")
             },
-            new XNameInfo[]
+            ContactXNames = new XNameInfo[]
             {
                 new XNameInfo(0, Array.Empty<string>(), "ANDROID-CUSTOM", new string[] { "vnd.android.cursor.item/nickname", "JS", "1", "", "", "", "", "", "", "", "", "", "", "", "", "" }, Array.Empty<string>()),
                 new XNameInfo(0, Array.Empty<string>(), "PHONETIC-FIRST-NAME", new string[] { "Saunders" }, Array.Empty<string>()),
                 new XNameInfo(0, Array.Empty<string>(), "PHONETIC-LAST-NAME",  new string[] { "John" }, Array.Empty<string>())
             },
-            "individual",
-            Array.Empty<PhotoInfo>(),
-            default,
-            Array.Empty<NicknameInfo>(),
-            default(DateTime),
-            "",
-            Array.Empty<RoleInfo>(),
-            Array.Empty<string>(),
-            Array.Empty<LogoInfo>(),
-            "",
-            "",
-            Array.Empty<Parts.TimeZoneInfo>(),
-            Array.Empty<GeoInfo>(),
-            Array.Empty<SoundInfo>(),
-            new ImppInfo[]
+            ContactImpps = new ImppInfo[]
             {
                 new ImppInfo(0, Array.Empty<string>(), "aim:john.s", new string[] { "HOME" })
-            },
-            "",
-            "",
-            "",
-            "",
-            ""
-        );
+            }
+        };
         #endregion
 
         #region multipleVcardTwoContacts
@@ -499,124 +366,86 @@ public static class ContactData
         private static readonly Card multipleVcardTwoContactsInstanceTwo = new
         (
             null,
-            "2.1",
-            new NameInfo[]
+            "2.1"
+        )
+        {
+            ContactNames = new NameInfo[]
             {
                 new NameInfo(0, Array.Empty<string>(), "Sarah", "Santos", Array.Empty<string>(), Array.Empty<string>(), Array.Empty<string>())
             },
-            "Sarah Santos",
-            new TelephoneInfo[]
+            ContactFullName = "Sarah Santos",
+            ContactTelephones = new TelephoneInfo[]
             {
                 new TelephoneInfo(0, Array.Empty<string>(), new string[] { "CELL" }, "589-210-1059")
             },
-            new AddressInfo[]
+            ContactAddresses = new AddressInfo[]
             {
                 new AddressInfo(0, Array.Empty<string>(), new string[] { "HOME" }, "", "", "New York, USA", "", "", "", "")
             },
-            new OrganizationInfo[]
+            ContactOrganizations = new OrganizationInfo[]
             {
                 new OrganizationInfo(0, Array.Empty<string>(), "Support Scammer Outcry Organization", "", "", new string[] { "WORK" })
             },
-            new TitleInfo[]
+            ContactTitles = new TitleInfo[]
             {
                 new TitleInfo(0, Array.Empty<string>(), "Chief Executive Officer")
             },
-            "https://sso.org/",
-            "",
-            new EmailInfo[]
+            ContactURL = "https://sso.org/",
+            ContactMails = new EmailInfo[]
             {
                 new EmailInfo(0, Array.Empty<string>(), new string[] { "HOME" }, "sarah.s@gmail.com"),
                 new EmailInfo(0, Array.Empty<string>(), new string[] { "WORK" }, "sarah.s@sso.org"),
             },
-            new XNameInfo[]
+            ContactXNames = new XNameInfo[]
             {
                 new XNameInfo(0, Array.Empty<string>(), "SIP", new string[] { "sip test" }, Array.Empty<string>()),
-            },
-            "individual",
-            Array.Empty<PhotoInfo>(),
-            default,
-            Array.Empty<NicknameInfo>(),
-            default(DateTime),
-            "",
-            Array.Empty<RoleInfo>(),
-            Array.Empty<string>(),
-            Array.Empty<LogoInfo>(),
-            "",
-            "",
-            Array.Empty<Parts.TimeZoneInfo>(),
-            Array.Empty<GeoInfo>(),
-            Array.Empty<SoundInfo>(),
-            Array.Empty<ImppInfo>(),
-            "",
-            "",
-            "",
-            "",
-            ""
-        );
+            }
+        };
         private static readonly Card multipleVcardTwoContactsInstanceThree = new
         (
             null,
-            "2.1",
-            new NameInfo[]
+            "2.1"
+        )
+        {
+            ContactNames = new NameInfo[]
             {
                 new NameInfo(0, Array.Empty<string>(), "Neville", "Navasquillo", new string[] { "Neville", "Nevile" }, new string[] { "Mr." }, new string[] { "Jr." })
             },
-            "Neville Navasquillo",
-            new TelephoneInfo[]
+            ContactFullName = "Neville Navasquillo",
+            ContactTelephones = new TelephoneInfo[]
             {
                 new TelephoneInfo(0, Array.Empty<string>(), new string[] { "CELL" }, "1-234-567-890"),
                 new TelephoneInfo(0, Array.Empty<string>(), new string[] { "WORK" }, "098-765-4321"),
                 new TelephoneInfo(0, Array.Empty<string>(), new string[] { "VOICE" }, "078-494-6434"),
                 new TelephoneInfo(0, Array.Empty<string>(), new string[] { "HOME" }, "348-404-8404"),
             },
-            new AddressInfo[]
+            ContactAddresses = new AddressInfo[]
             {
                 new AddressInfo(0, Array.Empty<string>(), new string[] { "WORK" }, "POBOX", "", "Street Address ExtAddress", "Reg", "Loc", "Postal", "Country"),
                 new AddressInfo(0, Array.Empty<string>(), new string[] { "HOME" }, "", "", "Street Address", "", "", "", ""),
             },
-            new OrganizationInfo[]
+            ContactOrganizations = new OrganizationInfo[]
             {
                 new OrganizationInfo(0, Array.Empty<string>(), "Organization", "", "", new string[] { "WORK" })
             },
-            new TitleInfo[]
+            ContactTitles = new TitleInfo[]
             {
                 new TitleInfo(0, Array.Empty<string>(), "Title")
             },
-            "",
-            "Notes",
-            new EmailInfo[]
+            ContactNotes = "Notes",
+            ContactMails = new EmailInfo[]
             {
                 new EmailInfo(0, Array.Empty<string>(), new string[] { "HOME" }, "neville.nvs@gmail.com"),
                 new EmailInfo(0, Array.Empty<string>(), new string[] { "WORK" }, "neville.nvs@nvsc.com"),
             },
-            new XNameInfo[]
+            ContactXNames = new XNameInfo[]
             {
                 new XNameInfo(0, Array.Empty<string>(), "ANDROID-CUSTOM", new string[] { "vnd.android.cursor.item/nickname", "NVL.N", "1", "", "", "", "", "", "", "", "", "", "", "", "", "" }, Array.Empty<string>()),
                 new XNameInfo(0, Array.Empty<string>(), "AIM", new string[] { "IM" }, new string[] { "HOME" }),
                 new XNameInfo(0, Array.Empty<string>(), "MSN", new string[] { "Windows LIVE" }, new string[] { "HOME" }),
                 new XNameInfo(0, Array.Empty<string>(), "YAHOO", new string[] { "Yahoo" }, new string[] { "HOME" }),
-            },
-            "individual",
-            Array.Empty<PhotoInfo>(),
-            default,
-            Array.Empty<NicknameInfo>(),
-            default(DateTime),
-            "",
-            Array.Empty<RoleInfo>(),
-            Array.Empty<string>(),
-            Array.Empty<LogoInfo>(),
-            "",
-            "",
-            Array.Empty<Parts.TimeZoneInfo>(),
-            Array.Empty<GeoInfo>(),
-            Array.Empty<SoundInfo>(),
-            Array.Empty<ImppInfo>(),
-            "",
-            "",
-            "",
-            "",
-            ""
-        );
+            }
+        };
         private static readonly Card multipleVcardTwoContactsInstanceFour = singleVcardTwoContactShortInstance;
         #endregion
 
@@ -686,126 +515,89 @@ public static class ContactData
         private static readonly Card multipleVcardThreeContactsInstanceTwo = new
         (
             null,
-            "3.0",
-            new NameInfo[]
+            "3.0"
+        )
+        {
+            ContactNames = new NameInfo[]
             {
                 new NameInfo(0, Array.Empty<string>(), "Sarah", "Santos", Array.Empty<string>(), Array.Empty<string>(), Array.Empty<string>())
             },
-            "Sarah Santos",
-            new TelephoneInfo[]
+            ContactFullName = "Sarah Santos",
+            ContactTelephones = new TelephoneInfo[]
             {
                 new TelephoneInfo(0, Array.Empty<string>(), new string[] { "cell" }, "589-210-1059")
             },
-            new AddressInfo[]
+            ContactAddresses = new AddressInfo[]
             {
                 new AddressInfo(0, Array.Empty<string>(), new string[] { "home" }, "", "", "New York, USA", "", "", "", "")
             },
-            new OrganizationInfo[]
+            ContactOrganizations = new OrganizationInfo[]
             {
                 new OrganizationInfo(0, Array.Empty<string>(), "Support Scammer Outcry Organization", "", "", new string[] { "WORK" })
             },
-            new TitleInfo[]
+            ContactTitles = new TitleInfo[]
             {
                 new TitleInfo(0, Array.Empty<string>(), "Chief Executive Officer")
             },
-            "https://sso.org/",
-            "",
-            new EmailInfo[]
+            ContactURL = "https://sso.org/",
+            ContactMails = new EmailInfo[]
             {
                 new EmailInfo(0, Array.Empty<string>(), new string[] { "home" }, "sarah.s@gmail.com"),
                 new EmailInfo(0, Array.Empty<string>(), new string[] { "work" }, "sarah.s@sso.org"),
             },
-            new XNameInfo[]
+            ContactXNames = new XNameInfo[]
             {
                 new XNameInfo(0, Array.Empty<string>(), "SIP", new string[] { "sip test" }, Array.Empty<string>()),
-            },
-            "individual",
-            Array.Empty<PhotoInfo>(),
-            default,
-            Array.Empty<NicknameInfo>(),
-            default(DateTime),
-            "",
-            Array.Empty<RoleInfo>(),
-            Array.Empty<string>(),
-            Array.Empty<LogoInfo>(),
-            "",
-            "",
-            Array.Empty<Parts.TimeZoneInfo>(),
-            Array.Empty<GeoInfo>(),
-            Array.Empty<SoundInfo>(),
-            Array.Empty<ImppInfo>(),
-            "",
-            "",
-            "",
-            "",
-            ""
-        );
+            }
+        };
         private static readonly Card multipleVcardThreeContactsInstanceThree = new
         (
             null,
-            "3.0",
-            new NameInfo[]
+            "3.0"
+        )
+        {
+            ContactNames = new NameInfo[]
             {
                 new NameInfo(0, Array.Empty<string>(), "Neville", "Navasquillo", new string[] { "Neville", "Nevile" }, new string[] { "Mr." }, new string[] { "Jr." })
             },
-            "Neville Navasquillo",
-            new TelephoneInfo[]
+            ContactFullName = "Neville Navasquillo",
+            ContactTelephones = new TelephoneInfo[]
             {
                 new TelephoneInfo(0, Array.Empty<string>(), new string[] { "cell" }, "1-234-567-890"),
                 new TelephoneInfo(0, Array.Empty<string>(), new string[] { "work" }, "098-765-4321"),
                 new TelephoneInfo(0, Array.Empty<string>(), new string[] { "voice" }, "078-494-6434"),
                 new TelephoneInfo(0, Array.Empty<string>(), new string[] { "home" }, "348-404-8404"),
             },
-            new AddressInfo[]
+            ContactAddresses = new AddressInfo[]
             {
                 new AddressInfo(0, Array.Empty<string>(), new string[] { "work" }, "POBOX", "", "Street Address ExtAddress", "Reg", "Loc", "Postal", "Country"),
                 new AddressInfo(0, Array.Empty<string>(), new string[] { "home" }, "", "", "Street Address", "", "", "", ""),
             },
-            new OrganizationInfo[]
+            ContactOrganizations = new OrganizationInfo[]
             {
                 new OrganizationInfo(0, Array.Empty<string>(), "Organization", "", "", new string[] { "WORK" })
             },
-            new TitleInfo[]
+            ContactTitles = new TitleInfo[]
             {
                 new TitleInfo(0, Array.Empty<string>(), "Title")
             },
-            "",
-            "Notes",
-            new EmailInfo[]
+            ContactNotes = "Notes",
+            ContactMails = new EmailInfo[]
             {
                 new EmailInfo(0, Array.Empty<string>(), new string[] { "home" }, "neville.nvs@gmail.com"),
                 new EmailInfo(0, Array.Empty<string>(), new string[] { "work" }, "neville.nvs@nvsc.com"),
             },
-            new XNameInfo[]
+            ContactXNames = new XNameInfo[]
             {
                 new XNameInfo(0, Array.Empty<string>(), "AIM", new string[] { "IM" }, new string[] { "HOME" }),
                 new XNameInfo(0, Array.Empty<string>(), "MSN", new string[] { "Windows LIVE" }, new string[] { "HOME" }),
                 new XNameInfo(0, Array.Empty<string>(), "YAHOO", new string[] { "Yahoo" }, new string[] { "HOME" }),
             },
-            "individual",
-            Array.Empty<PhotoInfo>(),
-            default,
-            new NicknameInfo[]
+            ContactNicknames = new NicknameInfo[]
             {
                 new NicknameInfo(0, Array.Empty<string>(), "NVL.N", new string[] { "HOME" })
-            },
-            default(DateTime),
-            "",
-            Array.Empty<RoleInfo>(),
-            Array.Empty<string>(),
-            Array.Empty<LogoInfo>(),
-            "",
-            "",
-            Array.Empty<Parts.TimeZoneInfo>(),
-            Array.Empty<GeoInfo>(),
-            Array.Empty<SoundInfo>(),
-            Array.Empty<ImppInfo>(),
-            "",
-            "",
-            "",
-            "",
-            ""
-        );
+            }
+        };
         private static readonly Card multipleVcardThreeContactsInstanceFour = singleVcardThreeContactShortInstance;
         #endregion
 
@@ -876,127 +668,90 @@ public static class ContactData
         private static readonly Card multipleVcardFourContactsInstanceTwo = new
         (
             null,
-            "4.0",
-            new NameInfo[]
+            "4.0"
+        )
+        {
+            ContactNames = new NameInfo[]
             {
                 new NameInfo(0, Array.Empty<string>(), "Neville", "Navasquillo", new string[] { "Neville", "Nevile" }, new string[] { "Mr." }, new string[] { "Jr." }),
                 new NameInfo(0, new string[] { "LANGUAGE=de" }, "Neville", "NAVASQUILLO", new string[] { "Neville", "Nevile" }, new string[] { "Mr." }, new string[] { "Jr." })
             },
-            "Neville Navasquillo",
-            new TelephoneInfo[]
+            ContactFullName = "Neville Navasquillo",
+            ContactTelephones = new TelephoneInfo[]
             {
                 new TelephoneInfo(0, Array.Empty<string>(), new string[] { "work" }, "098-765-4321"),
                 new TelephoneInfo(0, Array.Empty<string>(), new string[] { "cell" }, "1-234-567-890"),
                 new TelephoneInfo(0, Array.Empty<string>(), new string[] { "voice" }, "078-494-6434"),
                 new TelephoneInfo(0, Array.Empty<string>(), new string[] { "home" }, "348-404-8404"),
             },
-            new AddressInfo[]
+            ContactAddresses = new AddressInfo[]
             {
                 new AddressInfo(0, Array.Empty<string>(), new string[] { "work" }, "POBOX", "", "Street Address ExtAddress", "Reg", "Loc", "Postal", "Country"),
                 new AddressInfo(0, Array.Empty<string>(), new string[] { "home" }, "", "", "Street Address", "", "", "", ""),
             },
-            new OrganizationInfo[]
+            ContactOrganizations = new OrganizationInfo[]
             {
                 new OrganizationInfo(0, Array.Empty<string>(), "Organization", "", "", new string[] { "WORK" })
             },
-            new TitleInfo[]
+            ContactTitles = new TitleInfo[]
             {
                 new TitleInfo(0, Array.Empty<string>(), "Title")
             },
-            "",
-            "Notes",
-            new EmailInfo[]
+            ContactNotes = "Notes",
+            ContactMails = new EmailInfo[]
             {
                 new EmailInfo(0, Array.Empty<string>(), new string[] { "HOME" }, "neville.nvs@gmail.com"),
                 new EmailInfo(0, Array.Empty<string>(), new string[] { "WORK" }, "neville.nvs@nvsc.com"),
             },
-            new XNameInfo[]
+            ContactXNames = new XNameInfo[]
             {
                 new XNameInfo(0, Array.Empty<string>(), "ANDROID-CUSTOM", new string[] { "vnd.android.cursor.item/nickname", "NVL.N", "1", "", "", "", "", "", "", "", "", "", "", "", "", "" }, Array.Empty<string>()),
             },
-            "individual",
-            Array.Empty<PhotoInfo>(),
-            default,
-            Array.Empty<NicknameInfo>(),
-            default(DateTime),
-            "",
-            Array.Empty<RoleInfo>(),
-            Array.Empty<string>(),
-            Array.Empty<LogoInfo>(),
-            "",
-            "",
-            Array.Empty<Parts.TimeZoneInfo>(),
-            Array.Empty<GeoInfo>(),
-            Array.Empty<SoundInfo>(),
-            new ImppInfo[] 
-            { 
+            ContactImpps = new ImppInfo[]
+            {
                 new ImppInfo(0, Array.Empty<string>(), "aim:IM", new string[] { "HOME" }),
                 new ImppInfo(0, Array.Empty<string>(), "msn:Windows LIVE", new string[] { "HOME" }),
                 new ImppInfo(0, Array.Empty<string>(), "ymsgr:Yahoo", new string[] { "HOME" })
-            },
-            "",
-            "",
-            "",
-            "",
-            ""
-        );
+            }
+        };
         private static readonly Card multipleVcardFourContactsInstanceThree = new
         (
             null,
-            "4.0",
-            new NameInfo[]
+            "4.0"
+        )
+        {
+            ContactNames = new NameInfo[]
             {
                 new NameInfo(0, Array.Empty<string>(), "Sarah", "Santos", Array.Empty<string>(), Array.Empty<string>(), Array.Empty<string>())
             },
-            "Sarah Santos",
-            new TelephoneInfo[]
+            ContactFullName = "Sarah Santos",
+            ContactTelephones = new TelephoneInfo[]
             {
                 new TelephoneInfo(0, Array.Empty<string>(), new string[] { "cell" }, "589-210-1059")
             },
-            new AddressInfo[]
+            ContactAddresses = new AddressInfo[]
             {
                 new AddressInfo(0, Array.Empty<string>(), new string[] { "home" }, "", "", "New York, USA", "", "", "", "")
             },
-            new OrganizationInfo[]
+            ContactOrganizations = new OrganizationInfo[]
             {
                 new OrganizationInfo(0, Array.Empty<string>(), "Support Scammer Outcry Organization", "", "", new string[] { "WORK" })
             },
-            new TitleInfo[]
+            ContactTitles = new TitleInfo[]
             {
                 new TitleInfo(0, Array.Empty<string>(), "Chief Executive Officer")
             },
-            "https://sso.org/",
-            "",
-            new EmailInfo[]
+            ContactURL = "https://sso.org/",
+            ContactMails = new EmailInfo[]
             {
                 new EmailInfo(0, Array.Empty<string>(), new string[] { "HOME" }, "sarah.s@gmail.com"),
                 new EmailInfo(0, Array.Empty<string>(), new string[] { "WORK" }, "sarah.s@sso.org"),
             },
-            new XNameInfo[]
+            ContactXNames = new XNameInfo[]
             {
                 new XNameInfo(0, Array.Empty<string>(), "SIP-SIP", new string[] { "sip test" }, Array.Empty<string>()),
-            },
-            "individual",
-            Array.Empty<PhotoInfo>(),
-            default,
-            Array.Empty<NicknameInfo>(),
-            default(DateTime),
-            "",
-            Array.Empty<RoleInfo>(),
-            Array.Empty<string>(),
-            Array.Empty<LogoInfo>(),
-            "",
-            "",
-            Array.Empty<Parts.TimeZoneInfo>(),
-            Array.Empty<GeoInfo>(),
-            Array.Empty<SoundInfo>(),
-            Array.Empty<ImppInfo>(),
-            "",
-            "",
-            "",
-            "",
-            ""
-        );
+            }
+        };
         private static readonly Card multipleVcardFourContactsInstanceFour = singleVcardFourContactInstance;
         #endregion
 
@@ -1035,145 +790,76 @@ public static class ContactData
         private static readonly Card vcardThreeOldSampleInstanceOne = new
         (
             null,
-            "3.0",
-            new NameInfo[]
+            "3.0"
+        )
+        {
+            ContactNames = new NameInfo[]
             {
                 new NameInfo(0, Array.Empty<string>(), "Derik", "Stenerson", Array.Empty<string>(), Array.Empty<string>(), Array.Empty<string>())
             },
-            "Derik Stenerson",
-            new TelephoneInfo[]
+            ContactFullName = "Derik Stenerson",
+            ContactTelephones = new TelephoneInfo[]
             {
                 new TelephoneInfo(0, Array.Empty<string>(), new string[] { "WORK", "MSG" }, "+1-425-936-5522"),
                 new TelephoneInfo(0, Array.Empty<string>(), new string[] { "WORK", "FAX" }, "+1-425-936-7329")
             },
-            new AddressInfo[]
+            ContactAddresses = new AddressInfo[]
             {
                 new AddressInfo(0, Array.Empty<string>(), new string[] { "WORK", "POSTAL", "PARCEL" }, "", "", "One Microsoft Way", "Redmond", "WA", "98052-6399", "USA")
             },
-            new OrganizationInfo[]
+            ContactOrganizations = new OrganizationInfo[]
             {
                 new OrganizationInfo(0, Array.Empty<string>(), "Microsoft Corporation", "", "", new string[] { "WORK" })
             },
-            Array.Empty<TitleInfo>(), 
-            "",
-            "",
-            new EmailInfo[]
+            ContactMails = new EmailInfo[]
             {
                 new EmailInfo(0, Array.Empty<string>(), new string[] { "INTERNET" }, "deriks@Microsoft.com")
-            },
-            Array.Empty<XNameInfo>(),
-            "individual",
-            Array.Empty<PhotoInfo>(),
-            default,
-            Array.Empty<NicknameInfo>(),
-            default(DateTime),
-            "",
-            Array.Empty<RoleInfo>(),
-            Array.Empty<string>(),
-            Array.Empty<LogoInfo>(),
-            "",
-            "",
-            Array.Empty<Parts.TimeZoneInfo>(),
-            Array.Empty<GeoInfo>(),
-            Array.Empty<SoundInfo>(),
-            Array.Empty<ImppInfo>(),
-            "",
-            "",
-            "",
-            "",
-            ""
-        );
+            }
+        };
         private static readonly Card vcardThreeOldSampleInstanceTwo = new
         (
             null,
-            "3.0",
-            new NameInfo[]
+            "3.0"
+        )
+        {
+            ContactNames = new NameInfo[]
             {
                 new NameInfo(0, Array.Empty<string>(), "Anik", "Ganguly", Array.Empty<string>(), Array.Empty<string>(), Array.Empty<string>())
             },
-            "Anik Ganguly",
-            new TelephoneInfo[]
+            ContactFullName = "Anik Ganguly",
+            ContactTelephones = new TelephoneInfo[]
             {
                 new TelephoneInfo(0, Array.Empty<string>(), new string[] { "WORK", "MSG" }, "+1-734-542-5955")
             },
-            new AddressInfo[]
+            ContactAddresses = new AddressInfo[]
             {
                 new AddressInfo(0, Array.Empty<string>(), new string[] { "WORK", "POSTAL", "PARCEL" }, "", "Suite 101", "38777 West Six Mile Road", "Livonia", "MI", "48152", "USA")
             },
-            new OrganizationInfo[]
+            ContactOrganizations = new OrganizationInfo[]
             {
                 new OrganizationInfo(0, Array.Empty<string>(), " Open Text Inc.", "", "", new string[] { "WORK" })
             },
-            Array.Empty<TitleInfo>(),
-            "",
-            "",
-            new EmailInfo[]
+            ContactMails = new EmailInfo[]
             {
                 new EmailInfo(0, Array.Empty<string>(), new string[] { "INTERNET" }, "ganguly@acm.org")
-            },
-            Array.Empty<XNameInfo>(),
-            "individual",
-            Array.Empty<PhotoInfo>(),
-            default,
-            Array.Empty<NicknameInfo>(),
-            default(DateTime),
-            "",
-            Array.Empty<RoleInfo>(),
-            Array.Empty<string>(),
-            Array.Empty<LogoInfo>(),
-            "",
-            "",
-            Array.Empty<Parts.TimeZoneInfo>(),
-            Array.Empty<GeoInfo>(),
-            Array.Empty<SoundInfo>(),
-            Array.Empty<ImppInfo>(),
-            "",
-            "",
-            "",
-            "",
-            ""
-        );
+            }
+        };
         private static readonly Card vcardThreeOldSampleInstanceThree = new
         (
             null,
-            "3.0",
-            new NameInfo[]
+            "3.0"
+        )
+        {
+            ContactNames = new NameInfo[]
             {
                 new NameInfo(0, Array.Empty<string>(), "Robert", "Moskowitz", Array.Empty<string>(), Array.Empty<string>(), Array.Empty<string>())
             },
-            "Robert Moskowitz",
-            Array.Empty<TelephoneInfo>(),
-            Array.Empty<AddressInfo>(),
-            Array.Empty<OrganizationInfo>(),
-            Array.Empty<TitleInfo>(),
-            "",
-            "",
-            new EmailInfo[]
+            ContactFullName = "Robert Moskowitz",
+            ContactMails = new EmailInfo[]
             {
                 new EmailInfo(0, Array.Empty<string>(), new string[] { "INTERNET" }, "rgm-ietf@htt-consult.com")
-            },
-            Array.Empty<XNameInfo>(),
-            "individual",
-            Array.Empty<PhotoInfo>(),
-            default,
-            Array.Empty<NicknameInfo>(),
-            default(DateTime),
-            "",
-            Array.Empty<RoleInfo>(),
-            Array.Empty<string>(),
-            Array.Empty<LogoInfo>(),
-            "",
-            "",
-            Array.Empty<Parts.TimeZoneInfo>(),
-            Array.Empty<GeoInfo>(),
-            Array.Empty<SoundInfo>(),
-            Array.Empty<ImppInfo>(),
-            "",
-            "",
-            "",
-            "",
-            ""
-        );
+            }
+        };
         #endregion
 
         /// <summary>
diff --git a/VisualCard/Parsers/Four/VcardFour.cs b/VisualCard/Parsers/Four/VcardFour.cs
index ac2c696..69baabd 100644
--- a/VisualCard/Parsers/Four/VcardFour.cs
+++ b/VisualCard/Parsers/Four/VcardFour.cs
@@ -458,7 +458,38 @@ public override Card Parse()
                 throw new InvalidDataException("The full name specifier, \"FN:\", is required.");
 
             // Make a new instance of the card
-            return new Card(this, CardVersion, _names.ToArray(), _fullName, _telephones.ToArray(), _addresses.ToArray(), _orgs.ToArray(), _titles.ToArray(), _url, _note, _emails.ToArray(), _xes.ToArray(), _kind, _photos.ToArray(), _rev, _nicks.ToArray(), _bday, "", _roles.ToArray(), _categories.ToArray(), _logos.ToArray(), _prodId, _sortString, _timezones.ToArray(), _geos.ToArray(), _sounds.ToArray(), _impps.ToArray(), _source, _xml, _fbUrl, _calUri, _caladrUri);
+            return new Card(this, CardVersion, _kind)
+            {
+                CardRevision = _rev,
+                ContactNames = _names.ToArray(),
+                ContactFullName = _fullName,
+                ContactTelephones = _telephones.ToArray(),
+                ContactAddresses = _addresses.ToArray(),
+                ContactOrganizations = _orgs.ToArray(),
+                ContactTitles = _titles.ToArray(),
+                ContactURL = _url,
+                ContactNotes = _note,
+                ContactMails = _emails.ToArray(),
+                ContactXNames = _xes.ToArray(),
+                ContactPhotos = _photos.ToArray(),
+                ContactNicknames = _nicks.ToArray(),
+                ContactBirthdate = _bday,
+                ContactMailer = "",
+                ContactRoles = _roles.ToArray(),
+                ContactCategories = _categories.ToArray(),
+                ContactLogos = _logos.ToArray(),
+                ContactProdId = _prodId,
+                ContactSortString = _sortString,
+                ContactTimeZone = _timezones.ToArray(),
+                ContactGeo = _geos.ToArray(),
+                ContactSounds = _sounds.ToArray(),
+                ContactImpps = _impps.ToArray(),
+                ContactSource = _source,
+                ContactXml = _xml,
+                ContactFreeBusyUrl = _fbUrl,
+                ContactCalendarUrl = _calUri,
+                ContactCalendarSchedulingRequestUrl = _caladrUri
+            };
         }
 
         internal override string SaveToString(Card card)
diff --git a/VisualCard/Parsers/Three/VcardThree.cs b/VisualCard/Parsers/Three/VcardThree.cs
index 6ba3d0e..c818faa 100644
--- a/VisualCard/Parsers/Three/VcardThree.cs
+++ b/VisualCard/Parsers/Three/VcardThree.cs
@@ -313,7 +313,38 @@ public override Card Parse()
                 throw new InvalidDataException("The full name specifier, \"FN:\", is required.");
 
             // Make a new instance of the card
-            return new Card(this, CardVersion, _names.ToArray(), _fullName, _telephones.ToArray(), _addresses.ToArray(), _orgs.ToArray(), _titles.ToArray(), _url, _note, _emails.ToArray(), _xes.ToArray(), "individual", _photos.ToArray(), _rev, _nicks.ToArray(), _bday, _mailer, _roles.ToArray(), _categories.ToArray(), _logos.ToArray(), _prodId, _sortString, _timezones.ToArray(), _geos.ToArray(), _sounds.ToArray(), _impps.ToArray(), _source, "", "", "", "");
+            return new Card(this, CardVersion, "individual")
+            {
+                CardRevision = _rev,
+                ContactNames = _names.ToArray(),
+                ContactFullName = _fullName,
+                ContactTelephones = _telephones.ToArray(),
+                ContactAddresses = _addresses.ToArray(),
+                ContactOrganizations = _orgs.ToArray(),
+                ContactTitles = _titles.ToArray(),
+                ContactURL = _url,
+                ContactNotes = _note,
+                ContactMails = _emails.ToArray(),
+                ContactXNames = _xes.ToArray(),
+                ContactPhotos = _photos.ToArray(),
+                ContactNicknames = _nicks.ToArray(),
+                ContactBirthdate = _bday,
+                ContactMailer = _mailer,
+                ContactRoles = _roles.ToArray(),
+                ContactCategories = _categories.ToArray(),
+                ContactLogos = _logos.ToArray(),
+                ContactProdId = _prodId,
+                ContactSortString = _sortString,
+                ContactTimeZone = _timezones.ToArray(),
+                ContactGeo = _geos.ToArray(),
+                ContactSounds = _sounds.ToArray(),
+                ContactImpps = _impps.ToArray(),
+                ContactSource = _source,
+                ContactXml = "",
+                ContactFreeBusyUrl = "",
+                ContactCalendarUrl = "",
+                ContactCalendarSchedulingRequestUrl = ""
+            };
         }
 
         internal override string SaveToString(Card card)
diff --git a/VisualCard/Parsers/Two/VcardTwo.cs b/VisualCard/Parsers/Two/VcardTwo.cs
index 0cc3c20..0f5381f 100644
--- a/VisualCard/Parsers/Two/VcardTwo.cs
+++ b/VisualCard/Parsers/Two/VcardTwo.cs
@@ -256,7 +256,38 @@ public override Card Parse()
                 throw new InvalidDataException("The name specifier, \"N:\", is required.");
 
             // Make a new instance of the card
-            return new Card(this, CardVersion, _names.ToArray(), _fullName, _telephones.ToArray(), _addresses.ToArray(), _orgs.ToArray(), _titles.ToArray(), _url, _note, _emails.ToArray(), _xes.ToArray(), "individual", _photos.ToArray(), _rev, Array.Empty<NicknameInfo>(), _bday, _mailer, _roles.ToArray(), Array.Empty<string>(), _logos.ToArray(), "", "", _timezones.ToArray(), _geos.ToArray(), _sounds.ToArray(), _impps.ToArray(), _source, "", "", "", "");
+            return new Card(this, CardVersion, "individual")
+            {
+                CardRevision = _rev,
+                ContactNames = _names.ToArray(),
+                ContactFullName = _fullName,
+                ContactTelephones = _telephones.ToArray(),
+                ContactAddresses = _addresses.ToArray(),
+                ContactOrganizations = _orgs.ToArray(),
+                ContactTitles = _titles.ToArray(),
+                ContactURL = _url,
+                ContactNotes = _note,
+                ContactMails = _emails.ToArray(),
+                ContactXNames = _xes.ToArray(),
+                ContactPhotos = _photos.ToArray(),
+                ContactNicknames = Array.Empty<NicknameInfo>(),
+                ContactBirthdate = _bday,
+                ContactMailer = _mailer,
+                ContactRoles = _roles.ToArray(),
+                ContactCategories = Array.Empty<string>(),
+                ContactLogos = _logos.ToArray(),
+                ContactProdId = "",
+                ContactSortString = "",
+                ContactTimeZone = _timezones.ToArray(),
+                ContactGeo = _geos.ToArray(),
+                ContactSounds = _sounds.ToArray(),
+                ContactImpps = _impps.ToArray(),
+                ContactSource = _source,
+                ContactXml = "",
+                ContactFreeBusyUrl = "",
+                ContactCalendarUrl = "",
+                ContactCalendarSchedulingRequestUrl = ""
+            };
         }
 
         internal override string SaveToString(Card card)
diff --git a/VisualCard/Parts/Card.cs b/VisualCard/Parts/Card.cs
index 8ade289..0c6b56b 100644
--- a/VisualCard/Parts/Card.cs
+++ b/VisualCard/Parts/Card.cs
@@ -37,127 +37,127 @@ public class Card : IEquatable<Card>
         /// <summary>
         /// The VCard version
         /// </summary>
-        public string CardVersion { get; }
+        public string CardVersion { get; } = "";
         /// <summary>
         /// The VCard kind (individual is the default)
         /// </summary>
-        public string CardKind { get; }
+        public string CardKind { get; } = "individual";
         /// <summary>
         /// The contact's names
         /// </summary>
-        public NameInfo[] ContactNames { get; set; }
+        public NameInfo[] ContactNames { get; set; } = Array.Empty<NameInfo>();
         /// <summary>
         /// The contact's full name
         /// </summary>
-        public string ContactFullName { get; set; }
+        public string ContactFullName { get; set; } = "";
         /// <summary>
         /// The contact's telephones
         /// </summary>
-        public TelephoneInfo[] ContactTelephones { get; set; }
+        public TelephoneInfo[] ContactTelephones { get; set; } = Array.Empty<TelephoneInfo>();
         /// <summary>
         /// The contact's addresses
         /// </summary>
-        public AddressInfo[] ContactAddresses { get; set; }
+        public AddressInfo[] ContactAddresses { get; set; } = Array.Empty<AddressInfo>();
         /// <summary>
         /// The contact's e-mails
         /// </summary>
-        public EmailInfo[] ContactMails { get; set; }
+        public EmailInfo[] ContactMails { get; set; } = Array.Empty<EmailInfo>();
         /// <summary>
         /// The contact's organizations
         /// </summary>
-        public OrganizationInfo[] ContactOrganizations { get; set; }
+        public OrganizationInfo[] ContactOrganizations { get; set; } = Array.Empty<OrganizationInfo>();
         /// <summary>
         /// The contact's titles
         /// </summary>
-        public TitleInfo[] ContactTitles { get; set; }
+        public TitleInfo[] ContactTitles { get; set; } = Array.Empty<TitleInfo>();
         /// <summary>
         /// The contact's URL
         /// </summary>
-        public string ContactURL { get; set; }
+        public string ContactURL { get; set; } = "";
         /// <summary>
         /// The contact's photos
         /// </summary>
-        public PhotoInfo[] ContactPhotos { get; set; }
+        public PhotoInfo[] ContactPhotos { get; set; } = Array.Empty<PhotoInfo>();
         /// <summary>
         /// The contact's notes
         /// </summary>
-        public string ContactNotes { get; set; }
+        public string ContactNotes { get; set; } = "";
         /// <summary>
         /// The contact's extended options (usually starts with X-SOMETHING:Value1;Value2...)
         /// </summary>
-        public XNameInfo[] ContactXNames { get; set; }
+        public XNameInfo[] ContactXNames { get; set; } = Array.Empty<XNameInfo>();
         /// <summary>
         /// The card revision
         /// </summary>
-        public DateTime? CardRevision { get; set; }
+        public DateTime? CardRevision { get; set; } = default(DateTime);
         /// <summary>
         /// The contact's nicknames
         /// </summary>
-        public NicknameInfo[] ContactNicknames { get; set; }
+        public NicknameInfo[] ContactNicknames { get; set; } = Array.Empty<NicknameInfo>();
         /// <summary>
         /// The contact's birthdate
         /// </summary>
-        public DateTime? ContactBirthdate { get; set; }
+        public DateTime? ContactBirthdate { get; set; } = default(DateTime);
         /// <summary>
         /// The contact's mailing software
         /// </summary>
-        public string ContactMailer { get; set; }
+        public string ContactMailer { get; set; } = "";
         /// <summary>
         /// The contact's roles
         /// </summary>
-        public RoleInfo[] ContactRoles { get; set; }
+        public RoleInfo[] ContactRoles { get; set; } = Array.Empty<RoleInfo>();
         /// <summary>
         /// The contact's categories
         /// </summary>
-        public string[] ContactCategories { get; set; }
+        public string[] ContactCategories { get; set; } = Array.Empty<string>();
         /// <summary>
         /// The contact's logos
         /// </summary>
-        public LogoInfo[] ContactLogos { get; set; }
+        public LogoInfo[] ContactLogos { get; set; } = Array.Empty<LogoInfo>();
         /// <summary>
         /// The contact's product ID
         /// </summary>
-        public string ContactProdId { get; set; }
+        public string ContactProdId { get; set; } = "";
         /// <summary>
         /// The contact's sort string
         /// </summary>
-        public string ContactSortString { get; set; }
+        public string ContactSortString { get; set; } = "";
         /// <summary>
         /// The contact's time zones
         /// </summary>
-        public TimeZoneInfo[] ContactTimeZone { get; set; }
+        public TimeZoneInfo[] ContactTimeZone { get; set; } = Array.Empty<TimeZoneInfo>();
         /// <summary>
         /// The contact's geographical coordinates in (lat;long)
         /// </summary>
-        public GeoInfo[] ContactGeo { get; set; }
+        public GeoInfo[] ContactGeo { get; set; } = Array.Empty<GeoInfo>();
         /// <summary>
         /// The contact's sounds
         /// </summary>
-        public SoundInfo[] ContactSounds { get; set; }
+        public SoundInfo[] ContactSounds { get; set; } = Array.Empty<SoundInfo>();
         /// <summary>
         /// The contact's IMPP information
         /// </summary>
-        public ImppInfo[] ContactImpps { get; set; }
+        public ImppInfo[] ContactImpps { get; set; } = Array.Empty<ImppInfo>();
         /// <summary>
         /// The contact's card source
         /// </summary>
-        public string ContactSource { get; set; }
+        public string ContactSource { get; set; } = "";
         /// <summary>
         /// The contact's XML code
         /// </summary>
-        public string ContactXml { get; set; }
+        public string ContactXml { get; set; } = "";
         /// <summary>
         /// The contact's free/busy indicator URL
         /// </summary>
-        public string ContactFreeBusyUrl { get; set; }
+        public string ContactFreeBusyUrl { get; set; } = "";
         /// <summary>
         /// The contact's calendar URL
         /// </summary>
-        public string ContactCalendarUrl { get; set; }
+        public string ContactCalendarUrl { get; set; } = "";
         /// <summary>
         /// The contact's calendar scheduling request URL
         /// </summary>
-        public string ContactCalendarSchedulingRequestUrl { get; set; }
+        public string ContactCalendarSchedulingRequestUrl { get; set; } = "";
 
         internal BaseVcardParser Parser => _parser;
 
@@ -222,7 +222,12 @@ public bool Equals(Card source, Card target)
                 source.ContactBirthdate == target.ContactBirthdate &&
                 source.ContactMailer == target.ContactMailer &&
                 source.ContactProdId == target.ContactProdId &&
-                source.ContactSortString == target.ContactSortString
+                source.ContactSortString == target.ContactSortString &&
+                source.ContactSource == target.ContactSource &&
+                source.ContactXml == target.ContactXml &&
+                source.ContactFreeBusyUrl == target.ContactFreeBusyUrl &&
+                source.ContactCalendarUrl == target.ContactCalendarUrl &&
+                source.ContactCalendarSchedulingRequestUrl == target.ContactCalendarSchedulingRequestUrl
             ;
         }
 
@@ -267,40 +272,11 @@ public override int GetHashCode()
         public static bool operator !=(Card a, Card b)
             => !a.Equals(b);
 
-        internal Card(BaseVcardParser parser, string cardVersion, NameInfo[] contactNames, string contactFullName, TelephoneInfo[] contactTelephones, AddressInfo[] contactAddresses, OrganizationInfo[] contactOrganizations, TitleInfo[] contactTitles, string contactURL, string contactNotes, EmailInfo[] contactMails, XNameInfo[] contactXNames, string cardKind, PhotoInfo[] contactPhotos, DateTime cardRevision, NicknameInfo[] contactNicknames, DateTime? contactBirthdate, string contactMailer, RoleInfo[] contactRoles, string[] contactCategories, LogoInfo[] contactLogos, string contactProdId, string contactSortString, TimeZoneInfo[] contactTimeZone, GeoInfo[] contactGeo, SoundInfo[] contactSounds, ImppInfo[] contactImpps, string contactSource, string contactXml, string contactFreeBusyUrl, string contactCalendarUrl, string contactCalendarSchedulingRequestUrl)
+        internal Card(BaseVcardParser parser, string cardVersion, string cardKind = "individual")
         {
             _parser = parser;
             CardVersion = cardVersion;
-            ContactNames = contactNames;
-            ContactFullName = contactFullName;
-            ContactTelephones = contactTelephones;
-            ContactAddresses = contactAddresses;
-            ContactOrganizations = contactOrganizations;
-            ContactTitles = contactTitles;
-            ContactURL = contactURL;
-            ContactNotes = contactNotes;
-            ContactMails = contactMails;
-            ContactXNames = contactXNames;
             CardKind = cardKind;
-            ContactPhotos = contactPhotos;
-            CardRevision = cardRevision;
-            ContactNicknames = contactNicknames;
-            ContactBirthdate = contactBirthdate;
-            ContactMailer = contactMailer;
-            ContactRoles = contactRoles;
-            ContactCategories = contactCategories;
-            ContactLogos = contactLogos;
-            ContactProdId = contactProdId;
-            ContactSortString = contactSortString;
-            ContactTimeZone = contactTimeZone;
-            ContactGeo = contactGeo;
-            ContactSounds = contactSounds;
-            ContactImpps = contactImpps;
-            ContactSource = contactSource;
-            ContactXml = contactXml;
-            ContactFreeBusyUrl = contactFreeBusyUrl;
-            ContactCalendarUrl = contactCalendarUrl;
-            ContactCalendarSchedulingRequestUrl = contactCalendarSchedulingRequestUrl;
         }
     }
 }