Add type backtracking to recovery mechanism