Add auto-restarting