Added recovery feature