More changes and backoff support