Service response refactoring