Fix data handling to account for large responses