[Contacts] Refactored to comply with the new Generated API
[Personal Information] Refactored to comply with the new Generated API