ContactFactory doc and refactoring