diff --git a/scripts/zmwatch.pl.in b/scripts/zmwatch.pl.in
index 96235ccd3..1b4790bce 100644
--- a/scripts/zmwatch.pl.in
+++ b/scripts/zmwatch.pl.in
@@ -56,6 +56,7 @@ use constant START_DELAY => 30; # To give everything else time to start
 @EXTRA_PERL_LIB@
 use ZoneMinder;
 use ZoneMinder::Storage;
+use ZoneMinder::Monitor;
 use POSIX;
 use DBI;
 use autouse 'Data::Dumper'=>qw(Dumper);
@@ -80,91 +81,75 @@ Info('Watchdog starting, pausing for '.START_DELAY.' seconds');
 sleep(START_DELAY);
 
 my $dbh = zmDbConnect();
-my $sql = $Config{ZM_SERVER_ID} ? 'SELECT * FROM Monitors WHERE ServerId=?' : 'SELECT * FROM Monitors';
-my $sth = $dbh->prepare_cached($sql)
-    or Fatal("Can't prepare '$sql': ".$dbh->errstr());
 
 while (!$zm_terminate) {
-  while ( ! ( $dbh and $dbh->ping() ) ) {
-    if ( ! ( $dbh = zmDbConnect() ) ) {
+  while (!($dbh and $dbh->ping())) {
+    if (!($dbh = zmDbConnect())) {
       sleep($Config{ZM_WATCH_CHECK_INTERVAL});
     }
   }
 
-  my $res = $sth->execute( $Config{ZM_SERVER_ID} ? $Config{ZM_SERVER_ID} : () )
-    or Fatal('Can\'t execute: '.$sth->errstr());
-  while( my $monitor = $sth->fetchrow_hashref() ) {
+  foreach my $monitor (ZoneMinder::Monitor->find($Config{ZM_SERVER_ID} ? (ServerId=>$Config{ZM_SERVER_ID}) : ())) {
     next if $monitor->{Function} eq 'None';
     next if $monitor->{Type} eq 'WebSite';
     my $now = time(); 
     my $restart = 0;
-    if (zmMemVerify($monitor)) {
-# Check we have got an image recently
-      my $capture_time = zmGetLastWriteTime($monitor);
-      if (!defined($capture_time)) {
-# Can't read from shared data
-        Debug('LastWriteTime is not defined.');
-        zmMemInvalidate($monitor);
-        next;
-      }
-      Debug("Monitor $$monitor{Id} LastWriteTime is $capture_time.");
-      if (!$capture_time) {
-        my $startup_time = zmGetStartupTime($monitor);
-        if (($now - $startup_time) > $Config{ZM_WATCH_MAX_DELAY}) {
-          Warning(
-            "Restarting capture daemon for $$monitor{Name}, no image since startup. ".
-            "Startup time was $startup_time - now $now > $Config{ZM_WATCH_MAX_DELAY}"
-          );
-          $restart = 1;
-        } else {
-          # We can't get the last capture time so can't be sure it's died, it might just be starting up.
-          zmMemInvalidate($monitor);
-          next;
-        }
-      }
-      if (!$restart) {
-        my $max_image_delay = (
-          $monitor->{MaxFPS}
-          &&($monitor->{MaxFPS}>0)
-          &&($monitor->{MaxFPS}<1)
-        ) ? (3/$monitor->{MaxFPS})
-        : $Config{ZM_WATCH_MAX_DELAY}
-        ;
-        my $image_delay = $now - $capture_time;
-        Debug("Monitor $monitor->{Id} last captured $image_delay seconds ago, max is $max_image_delay");
-        if ( $image_delay > $max_image_delay ) {
-          Warning("Restarting capture daemon for "
-              .$monitor->{Name}.", time since last capture $image_delay seconds ($now-$capture_time)"
-              );
-          $restart = 1;
-        }
-      } # end if ! restart 
-    } else {
+
+    zmMemInvalidate($monitor);
+    if (!zmMemVerify($monitor)) {
       Info("Restarting capture daemon for $monitor->{Name}, shared data not valid");
-      $restart = 1;
+      $monitor->control('restart');
+      next;
     }
 
-    if ($restart) {
-      my $command;
-      if ($monitor->{Type} eq 'Local') {
-        $command = 'zmdc.pl restart zmc -d '.$monitor->{Device};
-      } else {
-        $command = 'zmdc.pl restart zmc -m '.$monitor->{Id};
+    # Check we have got an image recently
+    my $capture_time = zmGetLastWriteTime($monitor);
+    if (!defined($capture_time)) {
+      # Can't read from shared data
+      Warning('LastWriteTime is not defined.');
+      next;
+    }
+    Debug("Monitor $$monitor{Id} LastWriteTime is $capture_time.");
+    if (!$capture_time) {
+      # We can't get the last capture time so can't be sure it's died, it might just be starting up.
+      my $startup_time = zmGetStartupTime($monitor);
+      if (($now - $startup_time) > $Config{ZM_WATCH_MAX_DELAY}) {
+        Warning(
+          "Restarting capture daemon for $$monitor{Name}, no image since startup. ".
+          "Startup time was $startup_time - now $now > $Config{ZM_WATCH_MAX_DELAY}"
+        );
+        $monitor->control('restart');
       }
-      runCommand($command);
-    } elsif ($monitor->{Function} ne 'Monitor') {
-# Now check analysis daemon
-      $restart = 0;
+      next;
+    }
+
+    my $max_image_delay = (
+      $monitor->{MaxFPS}
+      &&($monitor->{MaxFPS}>0)
+      &&($monitor->{MaxFPS}<1)
+    ) ? (3/$monitor->{MaxFPS})
+    : $Config{ZM_WATCH_MAX_DELAY}
+    ;
+    my $image_delay = $now - $capture_time;
+    Debug("Monitor $monitor->{Id} last captured $image_delay seconds ago, max is $max_image_delay");
+    if ($image_delay > $max_image_delay) {
+      Warning('Restarting capture daemon for '.$monitor->{Name}.
+        ", time since last capture $image_delay seconds ($now-$capture_time)");
+      $monitor->control('restart');
+      next;
+    }
+
+    if ($monitor->{Function} ne 'Monitor') {
+      # Now check analysis thread
 # Check we have got an image recently
       my $image_time = zmGetLastReadTime($monitor);
       if (!defined($image_time)) {
-# Can't read from shared data
-        $restart = 1;
+        # Can't read from shared data
         Error("Error reading shared data for $$monitor{Id} $$monitor{Name}");
+        $monitor->control('restart');
+        next;
       } elsif (!$image_time) {
-# We can't get the last capture time so can't be sure it's died.
-        #$restart = 1;
-        Error("Last analyse time for $$monitor{Id} $$monitor{Name} was zero.");
+        Debug("Last analyse time for $$monitor{Id} $$monitor{Name} was zero.");
       } else {
         my $max_image_delay = ( $monitor->{MaxFPS}
             &&($monitor->{MaxFPS}>0)
@@ -176,25 +161,14 @@ while (!$zm_terminate) {
         Debug("Monitor $monitor->{Id} last analysed $image_delay seconds ago, max is $max_image_delay");
         if ($image_delay > $max_image_delay) {
           Warning("Analysis daemon for $$monitor{Id} $$monitor{Name} needs restarting,"
-              ." time since last analysis $image_delay seconds ($now-$image_time)"
-              );
-          $restart = 1;
+              ." time since last analysis $image_delay seconds ($now-$image_time)");
+            $monitor->control('restart');
+            next;
         }
       }
 
-      if ($restart) {
-        Info("Restarting analysis daemon for $$monitor{Id} $$monitor{Name}");
-        my $command;
-        if ( $monitor->{Type} eq 'Local' ) {
-          $command = 'zmdc.pl restart zmc -d '.$monitor->{Device};
-        } else {
-          $command = 'zmdc.pl restart zmc -m '.$monitor->{Id};
-        }
-        runCommand($command);
-      } # end if restart
     } # end if check analysis daemon
-    # Prevent open handles building up if we have connect to shared memory
-    zmMemInvalidate($monitor); # Close our file handle to the zmc process we are about to end
+
   } # end foreach monitor
 
   sleep($Config{ZM_WATCH_CHECK_INTERVAL});