Added features for recovery