Added more rate limit code