Contact refactoring