Contact model refactoring