Better handle API limits