Refactor social into service calls