Added rate limit and duration limit