Refactored usage of responses