Added checkpoint handling