Refactoring: adding response class