Add restart capability