Added framework for supporting cold and warm restart