Better handling of the API limits