Improved recovery support