Added restart behavior