Added rate limit auto management