Add cbrecovery implementation