Contact Factory refactoring