Added restart capabilities