Improved support for recovery