ContactInfoEntry refactoring