Add minimal support for recovery