Refactored contact services