Add restart support