diff --git a/includes/TaskManagers/AbstractTaskManager.php b/includes/TaskManagers/AbstractTaskManager.php
new file mode 100644
index 0000000..c017000
--- /dev/null
+++ b/includes/TaskManagers/AbstractTaskManager.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace NewfoldLabs\WP\Module\Installer\TaskManagers;
+
+use NewfoldLabs\WP\Module\Installer\Data\Options;
+
+/**
+ * Manages the execution of Tasks.
+ */
+abstract class AbstractTaskManager {
+
+	/**
+	 * The number of times a PluginUninstallTask can be retried.
+	 *
+	 * @var int
+	 */
+	protected static $retry_limit = 1;
+
+	/**
+	 * Name of the Queue.
+	 *
+	 * @var string
+	 */
+	protected static $queue_name = '';
+
+	/**
+	 * Name of the Hook.
+	 *
+	 * @var string
+	 */
+	protected static $hook_name = '';
+
+	/**
+	 * PluginUninstallTaskManager constructor.
+	 */
+	public function __construct() {
+		TaskManagerSchedules::init();
+	}
+
+	/**
+	 * Retrieve the Queue Name for the TaskManager.
+	 *
+	 * @return string
+	 */
+	public static function get_queue_name() {
+		return static::$queue_name;
+	}
+
+
+	/**
+	 * Retrieve the Hook Name for the TaskManager.
+	 *
+	 * @return string
+	 */
+	public static function get_hook_name() {
+		return static::$hook_name;
+	}
+
+
+	/**
+	 * Returns the status of given plugin slug - uninstalling/completed.
+	 *
+	 * @param string $plugin Plugin Slug
+	 * @return string|false
+	 */
+	public static function status( $plugin ) {
+		$plugins = \get_option( Options::get_option_name( static::$queue_name ), array() );
+		return array_search( $plugin, array_column( $plugins, 'slug' ), true );
+	}
+}
diff --git a/includes/TaskManagers/PluginActivationTaskManager.php b/includes/TaskManagers/PluginActivationTaskManager.php
index 89b74d9..94f25ec 100644
--- a/includes/TaskManagers/PluginActivationTaskManager.php
+++ b/includes/TaskManagers/PluginActivationTaskManager.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace NewfoldLabs\WP\Module\Installer\TaskManagers;
 
 use NewfoldLabs\WP\Module\Installer\Data\Options;
@@ -8,46 +9,43 @@
 /**
  * Manages the execution of PluginActivationTasks.
  */
-class PluginActivationTaskManager {
-
+class PluginActivationTaskManager extends AbstractTaskManager {
 	/**
-	 * The number of times a PluginActivationTask can be retried.
+	 * The number of times Hook can be retried.
 	 *
 	 * @var int
 	 */
-	private static $retry_limit = 1;
+	protected static $retry_limit = 1;
 
 	/**
 	 * The name of the queue, might be prefixed.
 	 *
 	 * @var string
 	 */
-	private static $queue_name = 'plugin_activation_queue';
+	protected static $queue_name = 'plugin_activation_queue';
+
+	/**
+	 * The name of the hook, might be prefixed.
+	 *
+	 * @var string
+	 */
+	protected static $hook_name = 'nfd_module_installer_plugin_activation_event';
 
 	/**
 	 * Schedules the crons.
 	 */
 	public function __construct() {
+		parent::__construct();
 
-		// Thirty second cron hook
-		add_action( 'nfd_module_installer_plugin_activation_event', array( $this, 'activate' ) );
+		// Thirty seconds cron hook
+		add_action( self::$hook_name, array( $this, 'activate' ) );
 
-		if ( ! wp_next_scheduled( 'nfd_module_installer_plugin_activation_event' ) ) {
-			wp_schedule_single_event( time() + 5, 'nfd_module_installer_plugin_activation_event' );
+		if ( ! wp_next_scheduled( self::$hook_name ) ) {
+			wp_schedule_single_event( time() + 5, self::$hook_name );
 		}
 	}
 
 
-	/**
-	 * Returns the queue name, might be prefixed.
-	 *
-	 * @return string
-	 */
-	public static function get_queue_name() {
-		return self::$queue_name;
-	}
-
-
 	/**
 	 * Queue out all the PluginActivationTask's in the plugin activation queue and execute them.
 	 *
@@ -143,15 +141,4 @@ public static function remove_from_queue( $plugin ) {
 
 		return \update_option( Options::get_option_name( self::$queue_name ), $queue->to_array() );
 	}
-
-	/**
-	 * Get the status of a given plugin slug from the queue.
-	 *
-	 * @param string $plugin The slug of the plugin.
-	 * @return boolean
-	 */
-	public static function status( $plugin ) {
-		$plugins = \get_option( Options::get_option_name( self::$queue_name ), array() );
-		return array_search( $plugin, array_column( $plugins, 'slug' ), true );
-	}
 }
diff --git a/includes/TaskManagers/PluginDeactivationTaskManager.php b/includes/TaskManagers/PluginDeactivationTaskManager.php
index ccbe835..3f78d06 100644
--- a/includes/TaskManagers/PluginDeactivationTaskManager.php
+++ b/includes/TaskManagers/PluginDeactivationTaskManager.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace NewfoldLabs\WP\Module\Installer\TaskManagers;
 
 use NewfoldLabs\WP\Module\Installer\Data\Options;
@@ -8,44 +9,37 @@
 /**
  * Manages the execution of PluginDeactivationTasks.
  */
-class PluginDeactivationTaskManager {
+class PluginDeactivationTaskManager extends AbstractTaskManager {
 
 	/**
-	 * The number of times a PluginDeactivationTask can be retried.
+	 * The name of the queue, might be prefixed.
 	 *
-	 * @var int
+	 * @var string
 	 */
-	private static $retry_limit = 1;
+	protected static $queue_name = 'plugin_deactivation_queue';
 
 	/**
-	 * The name of the queue, might be prefixed.
+	 * The name of the hook.
 	 *
 	 * @var string
 	 */
-	private static $queue_name = 'plugin_deactivation_queue';
+	protected static $hook_name = 'nfd_module_installer_plugin_deactivation_event';
 
 	/**
 	 * Schedules the crons.
 	 */
 	public function __construct() {
+		parent::__construct();
 
-		// Thirty second cron hook
-		add_action( 'nfd_module_installer_plugin_deactivation_event', array( $this, 'deactivate' ) );
+		// Thirty seconds cron hook
+		add_action( self::$hook_name, array( $this, 'deactivate' ) );
 
 		// Register the cron task
-		if ( ! wp_next_scheduled( 'nfd_module_installer_plugin_deactivation_event' ) ) {
-			wp_schedule_single_event( time() + 5, 'nfd_module_installer_plugin_deactivation_event' );
+		if ( ! wp_next_scheduled( self::$hook_name ) ) {
+			wp_schedule_single_event( time() + 5, self::$hook_name );
 		}
 	}
 
-	/**
-	 * Returns the queue name, might be prefixed.
-	 *
-	 * @return string
-	 */
-	public static function get_queue_name() {
-		return self::$queue_name;
-	}
 
 	/**
 	 * Queue out all the PluginDeactivationTask's in the plugin deactivation queue and execute them.
@@ -141,15 +135,4 @@ public static function remove_from_queue( $plugin ) {
 
 		return \update_option( Options::get_option_name( self::$queue_name ), $queue->to_array() );
 	}
-
-	/**
-	 * Get the status of a given plugin slug from the queue.
-	 *
-	 * @param string $plugin The slug of the plugin.
-	 * @return boolean
-	 */
-	public static function status( $plugin ) {
-		$plugins = \get_option( Options::get_option_name( self::$queue_name ), array() );
-		return array_search( $plugin, array_column( $plugins, 'slug' ), true );
-	}
 }
diff --git a/includes/TaskManagers/PluginInstallTaskManager.php b/includes/TaskManagers/PluginInstallTaskManager.php
index f09c9c2..2605ceb 100644
--- a/includes/TaskManagers/PluginInstallTaskManager.php
+++ b/includes/TaskManagers/PluginInstallTaskManager.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace NewfoldLabs\WP\Module\Installer\TaskManagers;
 
 use NewfoldLabs\WP\Module\Installer\Data\Options;
@@ -8,46 +9,36 @@
 /**
  * Manages the execution of PluginInstallTasks.
  */
-class PluginInstallTaskManager {
+class PluginInstallTaskManager extends AbstractTaskManager {
 
 	/**
-	 * The number of times a PluginInstallTask can be retried.
+	 * The name of the queue, might be prefixed.
 	 *
-	 * @var int
+	 * @var string
 	 */
-	private static $retry_limit = 1;
+	protected static $queue_name = 'plugin_install_queue';
 
 	/**
-	 * The name of the queue, might be prefixed.
+	 * The name of the Hook.
 	 *
 	 * @var string
 	 */
-	private static $queue_name = 'plugin_install_queue';
+	protected static $hook_name = 'nfd_module_installer_plugin_install_cron';
 
 	/**
 	 * Schedules the crons.
 	 */
 	public function __construct() {
-		// Ensure there is a thirty second option in the cron schedules
-		add_filter( 'cron_schedules', array( $this, 'add_thirty_seconds_schedule' ) );
+		parent::__construct();
 
-		// Thirty second cron hook
-		add_action( 'nfd_module_installer_plugin_install_cron', array( $this, 'install' ) );
+		// Thirty seconds cron hook
+		add_action( self::$hook_name, array( $this, 'install' ) );
 
-		// Register the cron task
-		if ( ! wp_next_scheduled( 'nfd_module_installer_plugin_install_cron' ) ) {
-			wp_schedule_event( time(), 'thirty_seconds', 'nfd_module_installer_plugin_install_cron' );
+		if ( ! wp_next_scheduled( self::$hook_name ) ) {
+			wp_schedule_event( time(), 'thirty_seconds', self::$hook_name );
 		}
 	}
 
-	/**
-	 * Returns the queue name, might be prefixed.
-	 *
-	 * @return string
-	 */
-	public static function get_queue_name() {
-		return self::$queue_name;
-	}
 
 	/**
 	 * Adds a 30 second cron schedule.
@@ -69,7 +60,7 @@ public function add_thirty_seconds_schedule( $schedules ) {
 	/**
 	 * Queue out a PluginInstallTask with the highest priority in the plugin install queue and execute it.
 	 *
-	 * @return array|false
+	 * @void
 	 */
 	public function install() {
 		/*
@@ -83,8 +74,11 @@ public function install() {
 		priority at the beginning of the array
 		*/
 		$plugin_to_install = array_shift( $plugins );
+
 		if ( ! $plugin_to_install ) {
-			return true;
+			self::complete();
+
+			return;
 		}
 
 		// Update the plugin install queue.
@@ -123,12 +117,10 @@ public function install() {
 			}
 		}
 
-		// If there are no more plugins to be installed then change the status to completed.
+		// If there are no more plugins to be installed then change the status to complete.
 		if ( empty( $plugins ) ) {
-			return \update_option( Options::get_option_name( 'plugins_init_status' ), 'completed' );
+			self::complete();
 		}
-
-		return true;
 	}
 
 	/**
@@ -191,15 +183,15 @@ public static function remove_from_queue( $plugin ) {
 		return \update_option( Options::get_option_name( self::$queue_name ), $queue->to_array() );
 	}
 
+
 	/**
-	 * Get the status of a given plugin slug from the queue.
+	 * Clear all the hook scheduling and update the status option
 	 *
-	 * @param string $plugin The slug of the plugin.
-	 * @return boolean
+	 * @return bool
 	 */
-	public static function status( $plugin ) {
-		$plugins = \get_option( Options::get_option_name( self::$queue_name ), array() );
-		return array_search( $plugin, array_column( $plugins, 'slug' ), true );
+	private static function complete() {
+		wp_clear_scheduled_hook( 'nfd_module_installer_plugin_install_cron' );
+		return \update_option( Options::get_option_name( 'plugins_init_status' ), 'completed' );
 	}
 
 	/**
diff --git a/includes/TaskManagers/PluginUninstallTaskManager.php b/includes/TaskManagers/PluginUninstallTaskManager.php
index 61bd8c9..f584aa4 100644
--- a/includes/TaskManagers/PluginUninstallTaskManager.php
+++ b/includes/TaskManagers/PluginUninstallTaskManager.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace NewfoldLabs\WP\Module\Installer\TaskManagers;
 
 use NewfoldLabs\WP\Module\Installer\Data\Plugins;
@@ -10,46 +11,44 @@
 /**
  * Manages the execution of PluginUninstallTasks.
  */
-class PluginUninstallTaskManager {
+class PluginUninstallTaskManager extends AbstractTaskManager {
 
 	/**
 	 * The number of times a PluginUninstallTask can be retried.
 	 *
 	 * @var int
 	 */
-	private static $retry_limit = 2;
+	protected static $retry_limit = 2;
 
 	/**
 	 * Name of the PluginUninstallTask Queue.
 	 *
 	 * @var string
 	 */
-	private static $queue_name = 'plugin_uninstall_queue';
+	protected static $queue_name = 'plugin_uninstall_queue';
+
+	/**
+	 * Name of the PluginUninstallTask Hook.
+	 *
+	 * @var string
+	 */
+	protected static $hook_name = 'nfd_module_installer_plugin_uninstall_cron';
 
 	/**
 	 * PluginUninstallTaskManager constructor.
 	 */
 	public function __construct() {
-		// Ensure there is a Ten second option in the cron schedules
-		add_filter( 'cron_schedules', array( $this, 'add_ten_seconds_schedule' ) );
+		parent::__construct();
 
 		// Ten second cron hook
-		add_action( 'nfd_module_installer_plugin_uninstall_cron', array( $this, 'uninstall' ) );
+		add_action( self::$hook_name, array( $this, 'uninstall' ) );
 
 		// Register the cron task
-		if ( ! wp_next_scheduled( 'nfd_module_installer_plugin_uninstall_cron' ) ) {
-			wp_schedule_event( time(), 'ten_seconds', 'nfd_module_installer_plugin_uninstall_cron' );
+		if ( ! wp_next_scheduled( self::$hook_name ) ) {
+			wp_schedule_event( time(), 'ten_seconds', self::$hook_name );
 		}
 	}
 
-	/**
-	 * Retrieve the Queue Name for the TaskManager to perform Plugin Uninstalls.
-	 *
-	 * @return string
-	 */
-	public static function get_queue_name() {
-		return self::$queue_name;
-	}
 
 	/**
 	 * Adds ten seconds option in the cron schedule.
@@ -86,6 +85,7 @@ public function uninstall() {
 		*/
 		$plugin_to_uninstall = array_shift( $plugins );
 		if ( ! $plugin_to_uninstall ) {
+			wp_unschedule_event( self::get_hook_name() );
 			return true;
 		}
 
@@ -172,15 +172,4 @@ public static function add_to_queue( PluginUninstallTask $plugin_uninstall_task
 
 		return \update_option( Options::get_option_name( self::$queue_name ), $queue->to_array() );
 	}
-
-	/**
-	 * Returns the status of given plugin slug - uninstalling/completed.
-	 *
-	 * @param string $plugin Plugin Slug
-	 * @return string|false
-	 */
-	public static function status( $plugin ) {
-		$plugins = \get_option( Options::get_option_name( self::$queue_name ), array() );
-		return array_search( $plugin, array_column( $plugins, 'slug' ), true );
-	}
 }
diff --git a/includes/TaskManagers/TaskManager.php b/includes/TaskManagers/TaskManager.php
index 0576e05..185813a 100644
--- a/includes/TaskManagers/TaskManager.php
+++ b/includes/TaskManagers/TaskManager.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace NewfoldLabs\WP\Module\Installer\TaskManagers;
 
 use NewfoldLabs\WP\Module\Installer\Data\Options;
@@ -25,8 +26,15 @@ final class TaskManager {
 	 * Constructor that registers all the TaskManagers.
 	 */
 	public function __construct() {
+		TaskManagerSchedules::init();
+
+		/**
+		 * Task Manager Class
+		 *
+		 * @var $task_manager PluginUninstallTaskManager|PluginDeactivationTaskManager|ThemeInstallTaskManager|PluginInstallTaskManager|PluginActivationTaskManager
+		 */
 		foreach ( $this->task_managers as $task_manager ) {
-			if ( ! empty( get_option( Options::get_option_name( $task_manager::get_queue_name() ), array() ) ) ) {
+			if ( wp_next_scheduled( $task_manager::get_hook_name() ) || ! empty( get_option( Options::get_option_name( $task_manager::get_queue_name() ), array() ) ) ) {
 				new $task_manager();
 			}
 		}
diff --git a/includes/TaskManagers/TaskManagerSchedules.php b/includes/TaskManagers/TaskManagerSchedules.php
new file mode 100644
index 0000000..912b8c4
--- /dev/null
+++ b/includes/TaskManagers/TaskManagerSchedules.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace NewfoldLabs\WP\Module\Installer\TaskManagers;
+
+/**
+ * Class TaskManagerSchedules
+ */
+abstract class TaskManagerSchedules {
+
+	/**
+	 * Init the Task Manager Schedules class
+	 */
+	public static function init() {
+		static $initialized = false;
+
+		if ( ! $initialized ) {
+			add_filter( 'cron_schedules', array( __CLASS__, 'add_schedules' ) );
+		}
+	}
+
+	/**
+	 * Adds a task manager cron schedule.
+	 *
+	 * @param array $schedules The existing cron schedule.
+	 * @return array
+	 */
+	public static function add_schedules( $schedules ) {
+		$schedules_to_add = array(
+			'thirty_seconds' => array(
+				'interval' => 30,
+				'display'  => __( 'Once Every Thirty Seconds' ),
+			),
+			'ten_seconds'    => array(
+				'interval' => 10,
+				'display'  => __( 'Once Every Ten Seconds' ),
+			),
+		);
+
+		foreach ( $schedules_to_add as $schedule_slug => $schedule_data ) {
+			if ( ! array_key_exists( $schedule_slug, $schedules ) || $schedule_data['interval'] !== $schedules[ $schedule_slug ]['interval'] ) {
+				$schedules[ $schedule_slug ] = $schedule_data;
+			}
+		}
+
+		return $schedules;
+	}
+}
diff --git a/includes/TaskManagers/ThemeInstallTaskManager.php b/includes/TaskManagers/ThemeInstallTaskManager.php
index 4dee92c..5582b04 100644
--- a/includes/TaskManagers/ThemeInstallTaskManager.php
+++ b/includes/TaskManagers/ThemeInstallTaskManager.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace NewfoldLabs\WP\Module\Installer\TaskManagers;
 
 use NewfoldLabs\WP\Module\Installer\Data\Options;
@@ -8,64 +9,37 @@
 /**
  * Manages the execution of ThemeInstallTasks.
  */
-class ThemeInstallTaskManager {
+class ThemeInstallTaskManager extends AbstractTaskManager {
 
 	/**
-	 * The number of times a ThemeInstallTask can be retried.
+	 * Name of the ThemeInstallTaskManager Queue.
 	 *
-	 * @var int
+	 * @var string
 	 */
-	private static $retry_limit = 1;
+	protected static $queue_name = 'theme_install_queue';
 
 	/**
-	 * Name of the ThemeInstallTaskManager Queue.
+	 * Name of the ThemeInstallTaskManager Hook.
 	 *
 	 * @var string
 	 */
-	private static $queue_name = 'theme_install_queue';
+	protected static $hook_name = 'nfd_module_installer_theme_install_cron';
 
 	/**
 	 * ThemeInstallTaskManager constructor.
 	 */
 	public function __construct() {
-		// Ensure there is a ten second option in the cron schedules
-		add_filter( 'cron_schedules', array( $this, 'add_ten_seconds_schedule' ) );
+		parent::__construct();
 
 		// Ten second cron hook
-		add_action( 'nfd_module_installer_theme_install_cron', array( $this, 'install' ) );
+		add_action( self::$hook_name, array( $this, 'install' ) );
 
 		// Register the cron task
-		if ( ! wp_next_scheduled( 'nfd_module_installer_theme_install_cron' ) ) {
-			wp_schedule_event( time(), 'ten_seconds', 'nfd_module_installer_theme_install_cron' );
+		if ( ! wp_next_scheduled( self::$hook_name ) ) {
+			wp_schedule_event( time(), 'ten_seconds', self::$hook_name );
 		}
 	}
 
-	/**
-	 * Retrieve the Queue Name for the TaskManager to perform Theme installation.
-	 *
-	 * @return string
-	 */
-	public static function get_queue_name() {
-		return self::$queue_name;
-	}
-
-	/**
-	 * Adds ten seconds option in the cron schedule.
-	 *
-	 * @param array $schedules Cron Schedule duration
-	 * @return array
-	 */
-	public function add_ten_seconds_schedule( $schedules ) {
-		if ( ! array_key_exists( 'ten_seconds', $schedules ) || 10 !== $schedules['ten_seconds']['interval'] ) {
-			$schedules['ten_seconds'] = array(
-				'interval' => 10,
-				'display'  => __( 'Once Every Ten Seconds' ),
-			);
-		}
-
-		return $schedules;
-	}
-
 	/**
 	 * Expedites an existing ThemeInstallTask with a given slug.
 	 *
@@ -106,7 +80,7 @@ public static function expedite( $theme_slug ) {
 				then re-queue the task at the end of the queue to be retried.
 			*/
 			if ( $theme_install_task->get_retries() <= self::$retry_limit ) {
-					array_push( $themes, $theme_install_task->to_array() );
+				array_push( $themes, $theme_install_task->to_array() );
 			}
 		}
 
@@ -138,6 +112,7 @@ public function install() {
 		*/
 		$theme_to_install = array_shift( $themes );
 		if ( ! $theme_to_install ) {
+			self::complete();
 			return true;
 		}
 
@@ -164,13 +139,13 @@ public function install() {
 				then re-queue the task at the end of the queue to be retried.
 			*/
 			if ( $theme_install_task->get_retries() <= self::$retry_limit ) {
-					array_push( $themes, $theme_install_task->to_array() );
+				array_push( $themes, $theme_install_task->to_array() );
 			}
 		}
 
 		// If there are no more themes to be installed then change the status to completed.
 		if ( empty( $themes ) ) {
-			\update_option( Options::get_option_name( 'theme_init_status' ), 'completed' );
+			self::complete();
 		}
 
 		// Update the theme install queue.
@@ -213,14 +188,14 @@ public static function add_to_queue( ThemeInstallTask $theme_install_task ) {
 		return \update_option( Options::get_option_name( self::$queue_name ), $queue->to_array() );
 	}
 
+
 	/**
-	 * Returns the status of given plugin slug - installing/completed.
+	 * Clear all the hook scheduling and update the status option
 	 *
-	 * @param string $theme Theme Slug
-	 * @return string|false
+	 * @return bool
 	 */
-	public static function status( $theme ) {
-		$themes = \get_option( Options::get_option_name( self::$queue_name ), array() );
-		return array_search( $theme, array_column( $themes, 'slug' ), true );
+	private static function complete() {
+		wp_clear_scheduled_hook( self::get_hook_name() );
+		return \update_option( Options::get_option_name( 'theme_init_status' ), 'completed' );
 	}
 }