Added rate limiter support