Add rate limit support (2)