Add support for recovery inside branches