Added rate limiting support