diff --git a/src/contact-editor/editor/businesseditor/businesseditorwidget.cpp b/src/contact-editor/editor/businesseditor/businesseditorwidget.cpp
--- a/src/contact-editor/editor/businesseditor/businesseditorwidget.cpp
+++ b/src/contact-editor/editor/businesseditor/businesseditorwidget.cpp
@@ -133,12 +133,12 @@
 {
     mLogoWidget->loadContact(contact);
     mOrganizationWidget->setText(contact.organization());
-    mProfessionWidget->setText(ContactEditor::Utils::loadCustom(contact, QStringLiteral("X-Profession")));
+    mProfessionWidget->setText(contact.profession());
     mTitleWidget->setText(contact.title());
     mDepartmentWidget->setText(contact.department());
-    mOfficeWidget->setText(ContactEditor::Utils::loadCustom(contact, QStringLiteral("X-Office")));
-    mManagerWidget->setText(ContactEditor::Utils::loadCustom(contact, QStringLiteral("X-ManagersName")));
-    mAssistantWidget->setText(ContactEditor::Utils::loadCustom(contact, QStringLiteral("X-AssistantsName")));
+    mOfficeWidget->setText(contact.office());
+    mManagerWidget->setText(contact.managersName());
+    mAssistantWidget->setText(contact.assistantsName());
 
     // groupware group
     mFreeBusyWidget->loadContact(contact);
@@ -149,12 +149,12 @@
     // general group
     mLogoWidget->storeContact(contact);
     contact.setOrganization(mOrganizationWidget->text());
-    ContactEditor::Utils::storeCustom(contact, QStringLiteral("X-Profession"), mProfessionWidget->text().trimmed());
+    contact.setProfession(mProfessionWidget->text().trimmed());
     contact.setTitle(mTitleWidget->text().trimmed());
     contact.setDepartment(mDepartmentWidget->text().trimmed());
-    ContactEditor::Utils::storeCustom(contact, QStringLiteral("X-Office"), mOfficeWidget->text().trimmed());
-    ContactEditor::Utils::storeCustom(contact, QStringLiteral("X-ManagersName"), mManagerWidget->text().trimmed());
-    ContactEditor::Utils::storeCustom(contact, QStringLiteral("X-AssistantsName"), mAssistantWidget->text().trimmed());
+    contact.setOffice(mOfficeWidget->text().trimmed());
+    contact.setManagersName(mManagerWidget->text().trimmed());
+    contact.setAssistantsName(mAssistantWidget->text().trimmed());
 
     // groupware group
     mFreeBusyWidget->storeContact(contact);
diff --git a/src/contact-editor/editor/generalinfoeditor/blogfeedwidget.cpp b/src/contact-editor/editor/generalinfoeditor/blogfeedwidget.cpp
--- a/src/contact-editor/editor/generalinfoeditor/blogfeedwidget.cpp
+++ b/src/contact-editor/editor/generalinfoeditor/blogfeedwidget.cpp
@@ -51,12 +51,12 @@
 
 void BlogfeedWidget::loadContact(const KContacts::Addressee &contact)
 {
-    mBlogFeed->setText(ContactEditor::Utils::loadCustom(contact, QStringLiteral("BlogFeed")));
+    mBlogFeed->setText(contact.blogFeed().url());
 }
 
 void BlogfeedWidget::storeContact(KContacts::Addressee &contact) const
 {
-    ContactEditor::Utils::storeCustom(contact, QStringLiteral("BlogFeed"), mBlogFeed->text().trimmed());
+    contact.setBlogFeed(QUrl(mBlogFeed->text().trimmed()));
 }
 
 void BlogfeedWidget::setReadOnly(bool readOnly)
diff --git a/src/contact-editor/editor/personaleditor/personaleditorwidget.cpp b/src/contact-editor/editor/personaleditor/personaleditorwidget.cpp
--- a/src/contact-editor/editor/personaleditor/personaleditorwidget.cpp
+++ b/src/contact-editor/editor/personaleditor/personaleditorwidget.cpp
@@ -73,19 +73,19 @@
 void PersonalEditorWidget::loadContact(const KContacts::Addressee &contact)
 {
     mBirthdateWidget->setDate(contact.birthday().date());
-    mAnniversaryWidget->setDate(QDate::fromString(ContactEditor::Utils::loadCustom(contact, QStringLiteral("X-Anniversary")),
-                                                  Qt::ISODate));
+    mAnniversaryWidget->setDate(contact.anniversary());
+
     // family group
-    mPartnerWidget->setText(ContactEditor::Utils::loadCustom(contact, QStringLiteral("X-SpousesName")));
+    mPartnerWidget->setText(contact.spousesName());
 }
 
 void PersonalEditorWidget::storeContact(KContacts::Addressee &contact)
 {
     contact.setBirthday(mBirthdateWidget->date());
-    ContactEditor::Utils::storeCustom(contact, QStringLiteral("X-Anniversary"), mAnniversaryWidget->date().toString(Qt::ISODate));
+    contact.setAnniversary(mAnniversaryWidget->date());
 
     // family group
-    ContactEditor::Utils::storeCustom(contact, QStringLiteral("X-SpousesName"), mPartnerWidget->text().trimmed());
+    contact.setSpousesName(mPartnerWidget->text().trimmed());
 }
 
 void PersonalEditorWidget::setReadOnly(bool readOnly)