Refactor to contacts