Some response refactoring