Change to return response object