Refactored the Response