Adding restart handler