Response class some refactoring