Refactor service messages