Added restart handler