Add restart handler