Add auto restarting