Added auto-restart to extraction