Refactored contacts