Changed RetryClient from single-tone to constructive