Improved handling identity contact data.