Added S3 and rate limit support.