Add restart mechanism