Change recovery functions to use different tags