Add support for restarts