Refactor service response