diff --git a/boot.php b/boot.php
index bf38c911cc..89ee8115ba 100644
--- a/boot.php
+++ b/boot.php
@@ -611,7 +611,7 @@ function check_db($via_worker) {
 	}
 	if ($build != DB_UPDATE_VERSION) {
 		// When we cannot execute the database update via the worker, we will do it directly
-		if (!proc_run(PRIORITY_CRITICAL, 'include/dbupdate.php') && $via_worker) {
+		if (!Worker::add(PRIORITY_CRITICAL, 'dbupdate') && $via_worker) {
 			update_db(get_app());
 		}
 	}
@@ -1031,8 +1031,10 @@ function get_max_import_size() {
 }
 
 /**
- * @brief Wrap calls to proc_close(proc_open()) and call hook
- * 	so plugins can take part in process :)
+ * @brief deprecated function to add actions to the workerqueue
+ *
+ * Please user Worker::add instead. This function here is only needed, since it is still called by the twitter addon.
+ * It can be safely removed after the next release.
  *
  * @param (integer|array) priority or parameter array, $cmd atrings are deprecated and are ignored
  *
@@ -1085,7 +1087,6 @@ function proc_run($cmd) {
 	}
 
 	$priority = PRIORITY_MEDIUM;
-	$dont_fork = get_config("system", "worker_dont_fork");
 	$created = datetime_convert();
 
 	if (is_int($run_parameter)) {
@@ -1097,9 +1098,6 @@ function proc_run($cmd) {
 		if (isset($run_parameter['created'])) {
 			$created = $run_parameter['created'];
 		}
-		if (isset($run_parameter['dont_fork'])) {
-			$dont_fork = $run_parameter['dont_fork'];
-		}
 	}
 
 	$argv = $args;
@@ -1117,29 +1115,6 @@ function proc_run($cmd) {
 		dba::insert('workerqueue', array('parameter' => $parameters, 'created' => $created, 'priority' => $priority));
 	}
 
-	// Should we quit and wait for the poller to be called as a cronjob?
-	if ($dont_fork) {
-		return true;
-	}
-
-	// If there is a lock then we don't have to check for too much worker
-	if (!Lock::set('poller_worker', 0)) {
-		return true;
-	}
-
-	// If there are already enough workers running, don't fork another one
-	$quit = Worker::tooMuchWorkers();
-	Lock::remove('poller_worker');
-
-	if ($quit) {
-		return true;
-	}
-
-	// Now call the poller to execute the jobs that we just added to the queue
-	$args = array("include/poller.php", "no_cron");
-
-	$a->proc_run($args);
-
 	return true;
 }
 
diff --git a/include/Contact.php b/include/Contact.php
index 8be873bd30..cbc6e6211e 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Core\Worker;
 use Friendica\Network\Probe;
 
 // Included here for completeness, but this is a very dangerous operation.
@@ -26,10 +27,10 @@ function user_remove($uid) {
 
 	// The user and related data will be deleted in "cron_expire_and_remove_users" (cronjobs.php)
 	q("UPDATE `user` SET `account_removed` = 1, `account_expires_on` = UTC_TIMESTAMP() WHERE `uid` = %d", intval($uid));
-	proc_run(PRIORITY_HIGH, "include/notifier.php", "removeme", $uid);
+	Worker::add(PRIORITY_HIGH, "notifier", "removeme", $uid);
 
 	// Send an update to the directory
-	proc_run(PRIORITY_LOW, "include/directory.php", $r['url']);
+	Worker::add(PRIORITY_LOW, "directory", $r['url']);
 
 	if($uid == local_user()) {
 		unset($_SESSION['authenticated']);
@@ -60,7 +61,7 @@ function contact_remove($id) {
 	dba::delete('contact', array('id' => $id));
 
 	// Delete the rest in the background
-	proc_run(PRIORITY_LOW, 'include/remove_contact.php', $id);
+	Worker::add(PRIORITY_LOW, 'remove_contact', $id);
 }
 
 
@@ -305,7 +306,7 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) {
 
 	if ((($profile["addr"] == "") || ($profile["name"] == "")) && ($profile["gid"] != 0) &&
 		in_array($profile["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
-		proc_run(PRIORITY_LOW, "include/update_gcontact.php", $profile["gid"]);
+		Worker::add(PRIORITY_LOW, "update_gcontact", $profile["gid"]);
 	}
 
 	// Show contact details of Diaspora contacts only if connected
diff --git a/include/api.php b/include/api.php
index d1ec25eabe..153e6c7eeb 100644
--- a/include/api.php
+++ b/include/api.php
@@ -9,6 +9,7 @@
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
+use Friendica\Core\Worker;
 
 require_once 'include/HTTPExceptions.php';
 require_once 'include/bbcode.php';
@@ -3761,10 +3762,10 @@ $called_api = null;
 		//$user = api_get_user(get_app());
 		$url = System::baseUrl() . '/profile/' . get_app()->user['nickname'];
 		if ($url && strlen(get_config('system', 'directory'))) {
-			proc_run(PRIORITY_LOW, "include/directory.php", $url);
+			Worker::add(PRIORITY_LOW, "directory", $url);
 		}
 
-		proc_run(PRIORITY_LOW, 'include/profile_update.php', api_user());
+		Worker::add(PRIORITY_LOW, 'profile_update', api_user());
 
 		// output for client
 		if ($data) {
diff --git a/include/cron.php b/include/cron.php
index 8b0fab77ab..260b143c5b 100644
--- a/include/cron.php
+++ b/include/cron.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\Core\Config;
+use Friendica\Core\Worker;
 
 function cron_run(&$argv, &$argc){
 	global $a;
@@ -31,31 +32,31 @@ function cron_run(&$argv, &$argc){
 	logger('cron: start');
 
 	// run queue delivery process in the background
-	proc_run(PRIORITY_NEGLIGIBLE, "include/queue.php");
+	Worker::add(PRIORITY_NEGLIGIBLE, "queue");
 
 	// run the process to discover global contacts in the background
-	proc_run(PRIORITY_LOW, "include/discover_poco.php");
+	Worker::add(PRIORITY_LOW, "discover_poco");
 
 	// run the process to update locally stored global contacts in the background
-	proc_run(PRIORITY_LOW, "include/discover_poco.php", "checkcontact");
+	Worker::add(PRIORITY_LOW, "discover_poco", "checkcontact");
 
 	// Expire and remove user entries
-	proc_run(PRIORITY_MEDIUM, "include/cronjobs.php", "expire_and_remove_users");
+	Worker::add(PRIORITY_MEDIUM, "cronjobs", "expire_and_remove_users");
 
 	// Call possible post update functions
-	proc_run(PRIORITY_LOW, "include/cronjobs.php", "post_update");
+	Worker::add(PRIORITY_LOW, "cronjobs", "post_update");
 
 	// update nodeinfo data
-	proc_run(PRIORITY_LOW, "include/cronjobs.php", "nodeinfo");
+	Worker::add(PRIORITY_LOW, "cronjobs", "nodeinfo");
 
 	// Clear cache entries
-	proc_run(PRIORITY_LOW, "include/cronjobs.php", "clear_cache");
+	Worker::add(PRIORITY_LOW, "cronjobs", "clear_cache");
 
 	// Repair missing Diaspora values in contacts
-	proc_run(PRIORITY_LOW, "include/cronjobs.php", "repair_diaspora");
+	Worker::add(PRIORITY_LOW, "cronjobs", "repair_diaspora");
 
 	// Repair entries in the database
-	proc_run(PRIORITY_LOW, "include/cronjobs.php", "repair_database");
+	Worker::add(PRIORITY_LOW, "cronjobs", "repair_database");
 
 	// once daily run birthday_updates and then expire in background
 	$d1 = get_config('system', 'last_expire_day');
@@ -63,19 +64,19 @@ function cron_run(&$argv, &$argc){
 
 	if ($d2 != intval($d1)) {
 
-		proc_run(PRIORITY_LOW, "include/cronjobs.php", "update_contact_birthdays");
+		Worker::add(PRIORITY_LOW, "cronjobs", "update_contact_birthdays");
 
-		proc_run(PRIORITY_LOW, "include/discover_poco.php", "update_server");
+		Worker::add(PRIORITY_LOW, "discover_poco", "update_server");
 
-		proc_run(PRIORITY_LOW, "include/discover_poco.php", "suggestions");
+		Worker::add(PRIORITY_LOW, "discover_poco", "suggestions");
 
 		set_config('system', 'last_expire_day', $d2);
 
-		proc_run(PRIORITY_LOW, 'include/expire.php');
+		Worker::add(PRIORITY_LOW, 'expire');
 
-		proc_run(PRIORITY_MEDIUM, 'include/dbclean.php');
+		Worker::add(PRIORITY_MEDIUM, 'dbclean');
 
-		proc_run(PRIORITY_LOW, "include/cronjobs.php", "update_photo_albums");
+		Worker::add(PRIORITY_LOW, "cronjobs", "update_photo_albums");
 
 		// Delete all done workerqueue entries
 		dba::delete('workerqueue', array('`done` AND `executed` < UTC_TIMESTAMP() - INTERVAL 12 HOUR'));
@@ -247,7 +248,7 @@ function cron_poll_contacts($argc, $argv) {
 			} else {
 				$priority = PRIORITY_LOW;
 			}
-			proc_run(array('priority' => $priority, 'dont_fork' => true), 'include/onepoll.php', (int)$contact['id']);
+			Worker::add(array('priority' => $priority, 'dont_fork' => true), 'onepoll', (int)$contact['id']);
 		}
 	}
 }
diff --git a/include/cronhooks.php b/include/cronhooks.php
index 4a852935a0..aa5d41afdd 100644
--- a/include/cronhooks.php
+++ b/include/cronhooks.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\Core\Config;
+use Friendica\Core\Worker;
 
 function cronhooks_run(&$argv, &$argc) {
 	global $a;
@@ -41,7 +42,7 @@ function cronhooks_run(&$argv, &$argc) {
 	if (is_array($a->hooks) && array_key_exists("cron", $a->hooks)) {
 		foreach ($a->hooks["cron"] as $hook) {
 			logger("Calling cronhooks for '" . $hook[1] . "'", LOGGER_DEBUG);
-			proc_run(PRIORITY_MEDIUM, "include/cronhooks.php", $hook[1]);
+			Worker::add(PRIORITY_MEDIUM, "cronhooks", $hook[1]);
 		}
 	}
 
diff --git a/include/dbclean.php b/include/dbclean.php
index bc41bead2d..1e1dd90829 100644
--- a/include/dbclean.php
+++ b/include/dbclean.php
@@ -5,6 +5,7 @@
  */
 
 use Friendica\Core\Config;
+use Friendica\Core\Worker;
 
 function dbclean_run(&$argv, &$argc) {
 	if (!Config::get('system', 'dbclean', false)) {
@@ -25,7 +26,7 @@ function dbclean_run(&$argv, &$argc) {
 			// Execute the background script for a step when it isn't finished.
 			// Execute step 8 and 9 only when $days is defined.
 			if (!Config::get('system', 'finished-dbclean-'.$i, false) && (($i < 8) || ($days > 0))) {
-				proc_run(PRIORITY_LOW, 'include/dbclean.php', $i);
+				Worker::add(PRIORITY_LOW, 'dbclean', $i);
 			}
 		}
 	} else {
@@ -297,6 +298,6 @@ function remove_orphans($stage = 0) {
 
 	// Call it again if not all entries were purged
 	if (($stage != 0) && ($count > 0)) {
-		proc_run(PRIORITY_MEDIUM, 'include/dbclean.php');
+		Worker::add(PRIORITY_MEDIUM, 'dbclean');
 	}
 }
diff --git a/include/dfrn.php b/include/dfrn.php
index 728a043ccd..ea072652f9 100644
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -9,6 +9,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Core\Worker;
 
 require_once("include/Contact.php");
 require_once("include/ostatus.php");
@@ -2019,7 +2020,7 @@ class dfrn {
 			$changed = true;
 
 			if ($entrytype == DFRN_REPLY_RC) {
-				proc_run(PRIORITY_HIGH, "include/notifier.php","comment-import", $current["id"]);
+				Worker::add(PRIORITY_HIGH, "notifier","comment-import", $current["id"]);
 			}
 		}
 
@@ -2652,7 +2653,7 @@ class dfrn {
 
 				if ($posted_id && $parent && ($entrytype == DFRN_REPLY_RC)) {
 					logger("Notifying followers about comment ".$posted_id, LOGGER_DEBUG);
-					proc_run(PRIORITY_HIGH, "include/notifier.php", "comment-import", $posted_id);
+					Worker::add(PRIORITY_HIGH, "notifier", "comment-import", $posted_id);
 				}
 
 				return true;
@@ -2834,7 +2835,7 @@ class dfrn {
 
 				if ($entrytype == DFRN_REPLY_RC) {
 					logger("Notifying followers about deletion of post " . $item["id"], LOGGER_DEBUG);
-					proc_run(PRIORITY_HIGH, "include/notifier.php","drop", $item["id"]);
+					Worker::add(PRIORITY_HIGH, "notifier","drop", $item["id"]);
 				}
 			}
 		}
diff --git a/include/diaspora.php b/include/diaspora.php
index 60c7909184..173e68578c 100644
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -12,6 +12,7 @@ use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
+use Friendica\Core\Worker;
 use Friendica\Network\Probe;
 
 require_once 'include/items.php';
@@ -1605,7 +1606,7 @@ class Diaspora {
 			dba::insert('sign', array('iid' => $message_id, 'signed_text' => json_encode($data)));
 
 			// notify others
-			proc_run(PRIORITY_HIGH, "include/notifier.php", "comment-import", $message_id);
+			Worker::add(PRIORITY_HIGH, "notifier", "comment-import", $message_id);
 		}
 
 		return true;
@@ -1915,7 +1916,7 @@ class Diaspora {
 			dba::insert('sign', array('iid' => $message_id, 'signed_text' => json_encode($data)));
 
 			// notify others
-			proc_run(PRIORITY_HIGH, "include/notifier.php", "comment-import", $message_id);
+			Worker::add(PRIORITY_HIGH, "notifier", "comment-import", $message_id);
 		}
 
 		return true;
@@ -2191,7 +2192,7 @@ class Diaspora {
 
 				$i = item_store($arr);
 				if ($i)
-					proc_run(PRIORITY_HIGH, "include/notifier.php", "activity", $i);
+					Worker::add(PRIORITY_HIGH, "notifier", "activity", $i);
 			}
 		}
 	}
@@ -2614,7 +2615,7 @@ class Diaspora {
 			// Now check if the retraction needs to be relayed by us
 			if ($parent["origin"]) {
 				// notify others
-				proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $item["id"]);
+				Worker::add(PRIORITY_HIGH, "notifier", "drop", $item["id"]);
 			}
 		}
 
diff --git a/include/directory.php b/include/directory.php
index e507a939f8..a2ccacf125 100644
--- a/include/directory.php
+++ b/include/directory.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\Core\Config;
+use Friendica\Core\Worker;
 
 function directory_run(&$argv, &$argc){
 	$dir = Config::get('system', 'directory');
@@ -37,7 +38,7 @@ function directory_update_all() {
 
 	if (dbm::is_result($r)) {
 		foreach ($r AS $user) {
-			proc_run(PRIORITY_LOW, 'include/directory.php', $user['url']);
+			Worker::add(PRIORITY_LOW, 'directory', $user['url']);
 		}
 	}
 }
diff --git a/include/discover_poco.php b/include/discover_poco.php
index dd208d492f..7361721cff 100644
--- a/include/discover_poco.php
+++ b/include/discover_poco.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\Core\Config;
+use Friendica\Core\Worker;
 
 require_once 'include/probe.php';
 require_once 'include/socgraph.php';
@@ -118,7 +119,7 @@ function update_server() {
 		}
 		logger('Update server status for server '.$server["url"], LOGGER_DEBUG);
 
-		proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", $server["url"]);
+		Worker::add(PRIORITY_LOW, "discover_poco", "server", $server["url"]);
 
 		if (++$updated > 250) {
 			return;
@@ -177,7 +178,7 @@ function discover_users() {
 
 		if ((($server_url == "") && ($user["network"] == NETWORK_FEED)) || $force_update || poco_check_server($server_url, $user["network"])) {
 			logger('Check profile '.$user["url"]);
-			proc_run(PRIORITY_LOW, "include/discover_poco.php", "check_profile", $user["url"]);
+			Worker::add(PRIORITY_LOW, "discover_poco", "check_profile", $user["url"]);
 
 			if (++$checked > 100) {
 				return;
diff --git a/include/expire.php b/include/expire.php
index bb0129aad6..c65f035d21 100644
--- a/include/expire.php
+++ b/include/expire.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\Core\Config;
+use Friendica\Core\Worker;
 
 function expire_run(&$argv, &$argc){
 	global $a;
@@ -47,14 +48,14 @@ function expire_run(&$argv, &$argc){
 
 	logger('expire: start');
 
-	proc_run(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
-			'include/expire.php', 'delete');
+	Worker::add(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
+			'expire', 'delete');
 
 	$r = dba::p("SELECT `uid`, `username` FROM `user` WHERE `expire` != 0");
 	while ($row = dba::fetch($r)) {
 		logger('Calling expiry for user '.$row['uid'].' ('.$row['username'].')', LOGGER_DEBUG);
-		proc_run(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
-				'include/expire.php', (int)$row['uid']);
+		Worker::add(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
+				'expire', (int)$row['uid']);
 	}
 	dba::close($r);
 
@@ -63,8 +64,8 @@ function expire_run(&$argv, &$argc){
 	if (is_array($a->hooks) && array_key_exists('expire', $a->hooks)) {
 		foreach ($a->hooks['expire'] as $hook) {
 			logger("Calling expire hook for '" . $hook[1] . "'", LOGGER_DEBUG);
-			proc_run(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
-					'include/expire.php', 'hook', $hook[1]);
+			Worker::add(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
+					'expire', 'hook', $hook[1]);
 		}
 	}
 
diff --git a/include/follow.php b/include/follow.php
index 650eb7fc89..83806ade7e 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Core\Worker;
 use Friendica\Network\Probe;
 
 require_once 'include/probe.php';
@@ -250,7 +251,7 @@ function new_contact($uid, $url, $interactive = false, $network = '') {
 
 	// pull feed and consume it, which should subscribe to the hub.
 
-	proc_run(PRIORITY_HIGH, "include/onepoll.php", $contact_id, "force");
+	Worker::add(PRIORITY_HIGH, "onepoll", $contact_id, "force");
 
 	$r = q("SELECT `contact`.*, `user`.* FROM `contact` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid`
 			WHERE `user`.`uid` = %d AND `contact`.`self` LIMIT 1",
diff --git a/include/identity.php b/include/identity.php
index 3686b23d2d..b1d42373b3 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -5,6 +5,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Core\Worker;
 
 require_once 'include/ForumManager.php';
 require_once 'include/bbcode.php';
@@ -888,7 +889,7 @@ function zrl_init(App $a) {
 			return;
 		}
 
-		proc_run(PRIORITY_LOW, 'include/gprobe.php', $tmp_str);
+		Worker::add(PRIORITY_LOW, 'gprobe', $tmp_str);
 		$arr = array('zrl' => $tmp_str, 'url' => $a->cmd);
 		call_hooks('zrl_init', $arr);
 	}
diff --git a/include/items.php b/include/items.php
index 4af4c6ab37..a939515602 100644
--- a/include/items.php
+++ b/include/items.php
@@ -9,6 +9,7 @@ use Friendica\Core\System;
 use Friendica\ParseUrl;
 use Friendica\Util\Lock;
 use Friendica\Core\Config;
+use Friendica\Core\Worker;
 
 require_once 'include/bbcode.php';
 require_once 'include/oembed.php';
@@ -1142,7 +1143,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 	check_item_notification($current_post, $uid);
 
 	if ($notify) {
-		proc_run(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), "include/notifier.php", $notify_type, $current_post);
+		Worker::add(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), "notifier", $notify_type, $current_post);
 	}
 
 	return $current_post;
@@ -1425,7 +1426,7 @@ function tag_deliver($uid, $item_id) {
 	);
 	update_thread($item_id);
 
-	proc_run(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), 'include/notifier.php', 'tgroup', $item_id);
+	Worker::add(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), 'notifier', 'tgroup', $item_id);
 
 }
 
@@ -2065,8 +2066,7 @@ function item_expire($uid, $days, $network = "", $force = false) {
 		drop_item($item['id'], false);
 	}
 
-	proc_run(array('priority' => PRIORITY_LOW, 'dont_fork' => true), "include/notifier.php", "expire", $uid);
-
+	Worker::add(array('priority' => PRIORITY_LOW, 'dont_fork' => true), "notifier", "expire", $uid);
 }
 
 /// @TODO type-hint is array
@@ -2088,7 +2088,7 @@ function drop_items($items) {
 	// multiple threads may have been deleted, send an expire notification
 
 	if ($uid) {
-		proc_run(array('priority' => PRIORITY_LOW, 'dont_fork' => true), "include/notifier.php", "expire", $uid);
+		Worker::add(array('priority' => PRIORITY_LOW, 'dont_fork' => true), "notifier", "expire", $uid);
 	}
 }
 
@@ -2280,7 +2280,7 @@ function drop_item($id, $interactive = true) {
 		$drop_id = intval($item['id']);
 		$priority = ($interactive ? PRIORITY_HIGH : PRIORITY_LOW);
 
-		proc_run(array('priority' => $priority, 'dont_fork' => true), "include/notifier.php", "drop", $drop_id);
+		Worker::add(array('priority' => $priority, 'dont_fork' => true), "notifier", "drop", $drop_id);
 
 		if (! $interactive) {
 			return $owner;
diff --git a/include/like.php b/include/like.php
index bce1c776f3..69dfa5cda1 100644
--- a/include/like.php
+++ b/include/like.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Core\Worker;
 
 require_once("include/diaspora.php");
 
@@ -166,7 +167,7 @@ function do_like($item_id, $verb) {
 		);
 
 		$like_item_id = $like_item['id'];
-		proc_run(PRIORITY_HIGH, "include/notifier.php", "like", $like_item_id);
+		Worker::add(PRIORITY_HIGH, "notifier", "like", $like_item_id);
 
 		if (!$event_verb_flag || $like_item['verb'] == $activity) {
 			return true;
@@ -253,7 +254,7 @@ EOT;
 
 	call_hooks('post_local_end', $new_item);
 
-	proc_run(PRIORITY_HIGH, "include/notifier.php", "like", $new_item_id);
+	Worker::add(PRIORITY_HIGH, "notifier", "like", $new_item_id);
 
 	return true;
 }
diff --git a/include/message.php b/include/message.php
index d6b1601110..731a56c4c2 100644
--- a/include/message.php
+++ b/include/message.php
@@ -4,6 +4,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Core\Worker;
 
 function send_message($recipient=0, $body='', $subject='', $replyto=''){
 
@@ -143,7 +144,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
 	}
 
 	if ($post_id) {
-		proc_run(PRIORITY_HIGH, "include/notifier.php", "mail", $post_id);
+		Worker::add(PRIORITY_HIGH, "notifier", "mail", $post_id);
 		return intval($post_id);
 	} else {
 		return -3;
diff --git a/include/notifier.php b/include/notifier.php
index e66fa9b0b0..4c693f70e7 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Core\Worker;
 
 require_once 'include/queue_fn.php';
 require_once 'include/html2plain.php';
@@ -19,7 +20,7 @@ require_once 'include/salmon.php';
 /*
  * The notifier is typically called with:
  *
- *		proc_run(PRIORITY_HIGH, "include/notifier.php", COMMAND, ITEM_ID);
+ *		Worker::add(PRIORITY_HIGH, "notifier", COMMAND, ITEM_ID);
  *
  * where COMMAND is one of the following:
  *
@@ -375,7 +376,7 @@ function notifier_run(&$argv, &$argc){
 			// a delivery fork. private groups (forum_mode == 2) do not uplink
 
 			if ((intval($parent['forum_mode']) == 1) && (! $top_level) && ($cmd !== 'uplink')) {
-				proc_run($a->queue['priority'], 'include/notifier.php', 'uplink', $item_id);
+				Worker::add($a->queue['priority'], 'notifier', 'uplink', $item_id);
 			}
 
 			$conversants = array();
@@ -514,8 +515,8 @@ function notifier_run(&$argv, &$argc){
 			}
 			logger("Deliver ".$target_item["guid"]." to ".$contact['url']." via network ".$contact['network'], LOGGER_DEBUG);
 
-			proc_run(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
-					'include/delivery.php', $cmd, $item_id, (int)$contact['id']);
+			Worker::add(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
+					'delivery', $cmd, $item_id, (int)$contact['id']);
 		}
 	}
 
@@ -579,8 +580,8 @@ function notifier_run(&$argv, &$argc){
 
 				if ((! $mail) && (! $fsuggest) && (! $followup)) {
 					logger('notifier: delivery agent: '.$rr['name'].' '.$rr['id'].' '.$rr['network'].' '.$target_item["guid"]);
-					proc_run(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
-							'include/delivery.php', $cmd, $item_id, (int)$rr['id']);
+					Worker::add(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
+							'delivery', $cmd, $item_id, (int)$rr['id']);
 				}
 			}
 		}
@@ -599,8 +600,8 @@ function notifier_run(&$argv, &$argc){
 		logger('Activating internal PuSH for item '.$item_id, LOGGER_DEBUG);
 
 		// Handling the pubsubhubbub requests
-		proc_run(array('priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true),
-				'include/pubsubpublish.php');
+		Worker::add(array('priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true),
+				'pubsubpublish');
 	}
 
 	logger('notifier: calling hooks', LOGGER_DEBUG);
diff --git a/include/poller.php b/include/poller.php
index a18d10b3c6..6eb04971c3 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -42,6 +42,15 @@ function poller_run($argv, $argc) {
 
 	load_hooks();
 
+	// At first check the maximum load. We shouldn't continue with a high load
+	if ($a->maxload_reached()) {
+		logger('Pre check: maximum load reached, quitting.', LOGGER_DEBUG);
+		return;
+	}
+
+	// We now start the process. This is done after the load check since this could increase the load.
+	$a->start_process();
+
 	$run_cron = (($argc <= 1) || ($argv[1] != "no_cron"));
 
 	Worker::processQueue($run_cron);
diff --git a/include/pubsubpublish.php b/include/pubsubpublish.php
index 23348d6d70..c662198abd 100644
--- a/include/pubsubpublish.php
+++ b/include/pubsubpublish.php
@@ -3,6 +3,7 @@
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
+use Friendica\Core\Worker;
 
 require_once('include/items.php');
 require_once('include/ostatus.php');
@@ -19,8 +20,8 @@ function pubsubpublish_run(&$argv, &$argc){
 
 		foreach ($r as $rr) {
 			logger("Publish feed to ".$rr["callback_url"], LOGGER_DEBUG);
-			proc_run(array('priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true),
-					'include/pubsubpublish.php', (int)$rr["id"]);
+			Worker::add(array('priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true),
+					'pubsubpublish', (int)$rr["id"]);
 		}
 	}
 
diff --git a/include/queue.php b/include/queue.php
index 865d6903a2..c398300c44 100644
--- a/include/queue.php
+++ b/include/queue.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\Core\Config;
+use Friendica\Core\Worker;
 
 require_once 'include/queue_fn.php';
 require_once 'include/dfrn.php';
@@ -27,7 +28,7 @@ function queue_run(&$argv, &$argc) {
 		logger('queue: start');
 
 		// Handling the pubsubhubbub requests
-		proc_run(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), 'include/pubsubpublish.php');
+		Worker::add(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), 'pubsubpublish');
 
 		$r = q("SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue`
 			INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id`
@@ -52,7 +53,7 @@ function queue_run(&$argv, &$argc) {
 		if (dbm::is_result($r)) {
 			foreach ($r as $q_item) {
 				logger('Call queue for id '.$q_item['id']);
-				proc_run(array('priority' => PRIORITY_LOW, 'dont_fork' => true), "include/queue.php", (int)$q_item['id']);
+				Worker::add(array('priority' => PRIORITY_LOW, 'dont_fork' => true), "queue", (int)$q_item['id']);
 			}
 		}
 		return;
diff --git a/include/socgraph.php b/include/socgraph.php
index f0a855d70c..2b9e51e4f6 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -10,6 +10,7 @@
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
+use Friendica\Core\Worker;
 use Friendica\Network\Probe;
 
 require_once 'include/datetime.php';
@@ -39,7 +40,7 @@ require_once 'include/Photo.php';
  */
 function poco_load($cid, $uid = 0, $zcid = 0, $url = null) {
 	// Call the function "poco_load_worker" via the worker
-	proc_run(PRIORITY_LOW, "include/discover_poco.php", "poco_load", (int)$cid, (int)$uid, (int)$zcid, $url);
+	Worker::add(PRIORITY_LOW, "discover_poco", "poco_load", (int)$cid, (int)$uid, (int)$zcid, $url);
 }
 
 /**
@@ -1702,7 +1703,7 @@ function poco_fetch_serverlist($poco) {
 		$r = q("SELECT `nurl` FROM `gserver` WHERE `nurl` = '%s'", dbesc(normalise_link($server_url)));
 		if (!dbm::is_result($r)) {
 			logger("Call server check for server ".$server_url, LOGGER_DEBUG);
-			proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", $server_url);
+			Worker::add(PRIORITY_LOW, "discover_poco", "server", $server_url);
 		}
 	}
 }
@@ -1724,7 +1725,7 @@ function poco_discover_federation() {
 		$servers = json_decode($serverdata);
 
 		foreach ($servers->pods as $server) {
-			proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", "https://".$server->host);
+			Worker::add(PRIORITY_LOW, "discover_poco", "server", "https://".$server->host);
 		}
 	}
 
@@ -1737,7 +1738,7 @@ function poco_discover_federation() {
 
 			foreach ($servers as $server) {
 				$url = (is_null($server->https_score) ? 'http' : 'https').'://'.$server->name;
-				proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", $url);
+				Worker::add(PRIORITY_LOW, "discover_poco", "server", $url);
 			}
 		}
 	}
@@ -1847,7 +1848,7 @@ function poco_discover($complete = false) {
 			}
 
 			logger('Update directory from server '.$server['url'].' with ID '.$server['id'], LOGGER_DEBUG);
-			proc_run(PRIORITY_LOW, "include/discover_poco.php", "update_server_directory", (int)$server['id']);
+			Worker::add(PRIORITY_LOW, "discover_poco", "update_server_directory", (int)$server['id']);
 
 			if (!$complete && (--$no_of_queries == 0)) {
 				break;
@@ -2125,7 +2126,7 @@ function get_gcontact_id($contact) {
 
 	if ($doprobing) {
 		logger("Last Contact: ". $last_contact_str." - Last Failure: ".$last_failure_str." - Checking: ".$contact["url"], LOGGER_DEBUG);
-		proc_run(PRIORITY_LOW, 'include/gprobe.php', $contact["url"]);
+		Worker::add(PRIORITY_LOW, 'gprobe', $contact["url"]);
 	}
 
 	return $gcontact_id;
diff --git a/include/uimport.php b/include/uimport.php
index 442df94460..fbdbeb58c6 100644
--- a/include/uimport.php
+++ b/include/uimport.php
@@ -3,6 +3,7 @@
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\PConfig;
+use Friendica\Core\Worker;
 
 require_once("include/Photo.php");
 define("IMPORT_DEBUG", False);
@@ -284,7 +285,7 @@ function import_account(App $a, $file) {
 	}
 
 	// send relocate messages
-	proc_run(PRIORITY_HIGH, 'include/notifier.php', 'relocate', $newuid);
+	Worker::add(PRIORITY_HIGH, 'notifier', 'relocate', $newuid);
 
 	info(t("Done. You can now login with your username and password"));
 	goaway(System::baseUrl() . "/login");
diff --git a/mod/admin.php b/mod/admin.php
index 4f0622532f..144539dcef 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -9,6 +9,7 @@
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
+use Friendica\Core\Worker;
 
 require_once("include/enotify.php");
 require_once("include/text.php");
@@ -694,7 +695,7 @@ function admin_page_site_post(App $a) {
 	check_form_security_token_redirectOnErr('/admin/site', 'admin_site');
 
 	if (!empty($_POST['republish_directory'])) {
-		proc_run(PRIORITY_LOW, 'include/directory.php');
+		Worker::add(PRIORITY_LOW, 'directory');
 		return;
 	}
 
@@ -767,7 +768,7 @@ function admin_page_site_post(App $a) {
 		$users = q("SELECT `uid` FROM `user` WHERE `account_removed` = 0 AND `account_expired` = 0");
 
 		foreach ($users as $user) {
-			proc_run(PRIORITY_HIGH, 'include/notifier.php', 'relocate', $user['uid']);
+			Worker::add(PRIORITY_HIGH, 'notifier', 'relocate', $user['uid']);
 		}
 
 		info("Relocation started. Could take a while to complete.");
@@ -855,7 +856,7 @@ function admin_page_site_post(App $a) {
 	// Has the directory url changed? If yes, then resubmit the existing profiles there
 	if ($global_directory != Config::get('system', 'directory') && ($global_directory != '')) {
 		Config::set('system', 'directory', $global_directory);
-		proc_run(PRIORITY_LOW, 'include/directory.php');
+		Worker::add(PRIORITY_LOW, 'directory');
 	}
 
 	if ($a->get_path() != "") {
diff --git a/mod/contacts.php b/mod/contacts.php
index 93013972f1..216d2451ea 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Core\Worker;
 use Friendica\Network\Probe;
 
 require_once 'include/Contact.php';
@@ -251,7 +252,7 @@ function _contact_update($contact_id) {
 				intval($contact_id));
 	} else
 		// pull feed and consume it, which should subscribe to the hub.
-		proc_run(PRIORITY_HIGH, "include/onepoll.php", $contact_id, "force");
+		Worker::add(PRIORITY_HIGH, "onepoll", $contact_id, "force");
 }
 
 function _contact_update_profile($contact_id) {
diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 0e99b26c32..e7869e1d22 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -20,6 +20,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Core\Worker;
 use Friendica\Network\Probe;
 
 require_once 'include/enotify.php';
@@ -494,7 +495,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
 
 					$i = item_store($arr);
 					if($i)
-						proc_run(PRIORITY_HIGH, "include/notifier.php", "activity", $i);
+						Worker::add(PRIORITY_HIGH, "notifier", "activity", $i);
 				}
 			}
 		}
@@ -796,7 +797,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
 
 					$i = item_store($arr);
 					if($i)
-						proc_run(PRIORITY_HIGH, "include/notifier.php", "activity", $i);
+						Worker::add(PRIORITY_HIGH, "notifier", "activity", $i);
 
 				}
 			}
diff --git a/mod/dirfind.php b/mod/dirfind.php
index 7d167494e6..a1253b1442 100644
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Core\Worker;
 
 require_once 'include/contact_widgets.php';
 require_once 'include/probe.php';
@@ -164,7 +165,7 @@ function dirfind_content(App $a, $prefix = "") {
 			}
 
 			// Add found profiles from the global directory to the local directory
-			proc_run(PRIORITY_LOW, 'include/discover_poco.php', "dirsearch", urlencode($search));
+			Worker::add(PRIORITY_LOW, 'discover_poco', "dirsearch", urlencode($search));
 		} else {
 
 			$p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : '');
diff --git a/mod/events.php b/mod/events.php
index de65790a77..c89684f74c 100644
--- a/mod/events.php
+++ b/mod/events.php
@@ -6,6 +6,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Core\Worker;
 
 require_once 'include/bbcode.php';
 require_once 'include/datetime.php';
@@ -177,7 +178,7 @@ function events_post(App $a) {
 	$item_id = event_store($datarray);
 
 	if (! $cid) {
-		proc_run(PRIORITY_HIGH, "include/notifier.php", "event", $item_id);
+		Worker::add(PRIORITY_HIGH, "notifier", "event", $item_id);
 	}
 
 	goaway($_SESSION['return_url']);
diff --git a/mod/fsuggest.php b/mod/fsuggest.php
index 32ed63b4c2..efaf100efc 100644
--- a/mod/fsuggest.php
+++ b/mod/fsuggest.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\Worker;
 
 function fsuggest_post(App $a) {
 
@@ -59,7 +60,7 @@ function fsuggest_post(App $a) {
 					intval($fsuggest_id),
 					intval(local_user())
 				);
-				proc_run(PRIORITY_HIGH, 'include/notifier.php', 'suggest', $fsuggest_id);
+				Worker::add(PRIORITY_HIGH, 'notifier', 'suggest', $fsuggest_id);
 			}
 
 			info( t('Friend suggestion sent.') . EOL);
diff --git a/mod/item.php b/mod/item.php
index 1033521948..0d09b1903a 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -17,6 +17,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Core\Worker;
 
 require_once 'include/crypto.php';
 require_once 'include/enotify.php';
@@ -830,7 +831,7 @@ function item_post(App $a) {
 		// update filetags in pconfig
 		file_tag_update_pconfig($uid,$categories_old,$categories_new,'category');
 
-		proc_run(PRIORITY_HIGH, "include/notifier.php", 'edit_post', $post_id);
+		Worker::add(PRIORITY_HIGH, "notifier", 'edit_post', $post_id);
 		if ((x($_REQUEST, 'return')) && strlen($return_path)) {
 			logger('return: ' . $return_path);
 			goaway($return_path);
@@ -1060,10 +1061,10 @@ function item_post(App $a) {
 	// We now do it in the background to save some time.
 	// This is important in interactive environments like the frontend or the API.
 	// We don't fork a new process since this is done anyway with the following command
-	proc_run(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), "include/create_shadowentry.php", $post_id);
+	Worker::add(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), "create_shadowentry", $post_id);
 
 	// Call the background process that is delivering the item to the receivers
-	proc_run(PRIORITY_HIGH, "include/notifier.php", $notify_type, $post_id);
+	Worker::add(PRIORITY_HIGH, "notifier", $notify_type, $post_id);
 
 	logger('post_complete');
 
diff --git a/mod/mood.php b/mod/mood.php
index c4d93b6de2..26eb736d19 100644
--- a/mod/mood.php
+++ b/mod/mood.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Core\Worker;
 
 require_once('include/security.php');
 require_once('include/bbcode.php');
@@ -98,13 +99,13 @@ function mood_init(App $a) {
 			intval($uid),
 			intval($item_id)
 		);
-		proc_run(PRIORITY_HIGH, "include/notifier.php", "tag", $item_id);
+		Worker::add(PRIORITY_HIGH, "notifier", "tag", $item_id);
 	}
 
 
 	call_hooks('post_local_end', $arr);
 
-	proc_run(PRIORITY_HIGH, "include/notifier.php", "like", $post_id);
+	Worker::add(PRIORITY_HIGH, "notifier", "like", $post_id);
 
 	return;
 }
diff --git a/mod/photos.php b/mod/photos.php
index bafd97ebee..e626ef4005 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -3,6 +3,7 @@
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
+use Friendica\Core\Worker;
 use Friendica\Network\Probe;
 
 require_once 'include/Photo.php';
@@ -304,7 +305,7 @@ function photos_post(App $a) {
 					// send the notification upstream/downstream as the case may be
 
 					if ($rr['visible']) {
-						proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $drop_id);
+						Worker::add(PRIORITY_HIGH, "notifier", "drop", $drop_id);
 					}
 				}
 			}
@@ -381,7 +382,7 @@ function photos_post(App $a) {
 				photo_albums($page_owner_uid, true);
 
 				if ($i[0]['visible']) {
-					proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $drop_id);
+					Worker::add(PRIORITY_HIGH, "notifier", "drop", $drop_id);
 				}
 			}
 		}
@@ -729,7 +730,7 @@ function photos_post(App $a) {
 
 					$item_id = item_store($arr);
 					if ($item_id) {
-						proc_run(PRIORITY_HIGH, "include/notifier.php", "tag", $item_id);
+						Worker::add(PRIORITY_HIGH, "notifier", "tag", $item_id);
 					}
 				}
 			}
@@ -934,7 +935,7 @@ function photos_post(App $a) {
 	photo_albums($page_owner_uid, true);
 
 	if ($visible) {
-		proc_run(PRIORITY_HIGH, "include/notifier.php", 'wall-new', $item_id);
+		Worker::add(PRIORITY_HIGH, "notifier", 'wall-new', $item_id);
 	}
 
 	call_hooks('photo_post_end',intval($item_id));
diff --git a/mod/poke.php b/mod/poke.php
index ca02b6bee5..c02d59c460 100644
--- a/mod/poke.php
+++ b/mod/poke.php
@@ -16,6 +16,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Core\Worker;
 
 require_once('include/security.php');
 require_once('include/bbcode.php');
@@ -137,13 +138,13 @@ function poke_init(App $a) {
 		//	intval($uid),
 		//	intval($item_id)
 		//);
-		proc_run(PRIORITY_HIGH, "include/notifier.php", "tag", $item_id);
+		Worker::add(PRIORITY_HIGH, "notifier", "tag", $item_id);
 	}
 
 
 	call_hooks('post_local_end', $arr);
 
-	proc_run(PRIORITY_HIGH, "include/notifier.php", "like", $post_id);
+	Worker::add(PRIORITY_HIGH, "notifier", "like", $post_id);
 
 	return;
 }
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index b4723b215f..bc93144539 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Core\Worker;
 
 require_once("include/Photo.php");
 
@@ -129,10 +130,10 @@ function profile_photo_post(App $a) {
 				// Update global directory in background
 				$url = System::baseUrl() . '/profile/' . $a->user['nickname'];
 				if ($url && strlen(get_config('system','directory'))) {
-					proc_run(PRIORITY_LOW, "include/directory.php", $url);
+					Worker::add(PRIORITY_LOW, "directory", $url);
 				}
 
-				proc_run(PRIORITY_LOW, 'include/profile_update.php', local_user());
+				Worker::add(PRIORITY_LOW, 'profile_update', local_user());
 			} else {
 				notice( t('Unable to process image') . EOL);
 			}
@@ -229,7 +230,7 @@ function profile_photo_content(App $a) {
 			// Update global directory in background
 			$url = $_SESSION['my_url'];
 			if ($url && strlen(get_config('system','directory'))) {
-				proc_run(PRIORITY_LOW, "include/directory.php", $url);
+				Worker::add(PRIORITY_LOW, "directory", $url);
 			}
 
 			goaway(System::baseUrl() . '/profiles');
diff --git a/mod/profiles.php b/mod/profiles.php
index 4a1d1ad934..90296322a2 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Core\Worker;
 use Friendica\Network\Probe;
 
 require_once 'include/Contact.php';
@@ -497,10 +498,10 @@ function profiles_post(App $a) {
 			// Update global directory in background
 			$url = $_SESSION['my_url'];
 			if ($url && strlen(get_config('system', 'directory'))) {
-				proc_run(PRIORITY_LOW, "include/directory.php", $url);
+				Worker::add(PRIORITY_LOW, "directory", $url);
 			}
 
-			proc_run(PRIORITY_LOW, 'include/profile_update.php', local_user());
+			Worker::add(PRIORITY_LOW, 'profile_update', local_user());
 
 			// Update the global contact for the user
 			update_gcontact_for_user(local_user());
@@ -594,7 +595,7 @@ function profile_activity($changed, $value) {
 
 	$i = item_store($arr);
 	if ($i) {
-		proc_run(PRIORITY_HIGH, "include/notifier.php", "activity", $i);
+		Worker::add(PRIORITY_HIGH, "notifier", "activity", $i);
 	}
 }
 
diff --git a/mod/register.php b/mod/register.php
index cb9c1729f5..d3a7e00924 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Core\Worker;
 
 require_once('include/enotify.php');
 require_once('include/bbcode.php');
@@ -69,7 +70,7 @@ function register_post(App $a) {
 
 	if($netpublish && $a->config['register_policy'] != REGISTER_APPROVE) {
 		$url = System::baseUrl() . '/profile/' . $user['nickname'];
-		proc_run(PRIORITY_LOW, "include/directory.php", $url);
+		Worker::add(PRIORITY_LOW, "directory", $url);
 	}
 
 	$using_invites = get_config('system','invitation_only');
diff --git a/mod/regmod.php b/mod/regmod.php
index a2c454f9a2..be57c8d656 100644
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Core\Worker;
 
 require_once('include/enotify.php');
 require_once('include/user.php');
@@ -42,7 +43,7 @@ function user_allow($hash) {
 	if (dbm::is_result($r) && $r[0]['net-publish']) {
 		$url = System::baseUrl() . '/profile/' . $user[0]['nickname'];
 		if ($url && strlen(get_config('system','directory'))) {
-			proc_run(PRIORITY_LOW, "include/directory.php", $url);
+			Worker::add(PRIORITY_LOW, "directory", $url);
 		}
 	}
 
diff --git a/mod/settings.php b/mod/settings.php
index e8d24f43de..b4d8d338f9 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Core\Worker;
 
 require_once('include/group.php');
 require_once('include/socgraph.php');
@@ -355,7 +356,7 @@ function settings_post(App $a) {
 	check_form_security_token_redirectOnErr('/settings', 'settings');
 
 	if (x($_POST,'resend_relocate')) {
-		proc_run(PRIORITY_HIGH, 'include/notifier.php', 'relocate', local_user());
+		Worker::add(PRIORITY_HIGH, 'notifier', 'relocate', local_user());
 		info(t("Relocate message has been send to your contacts"));
 		goaway('settings');
 	}
@@ -629,11 +630,11 @@ function settings_post(App $a) {
 		// Update global directory in background
 		$url = $_SESSION['my_url'];
 		if ($url && strlen(get_config('system','directory'))) {
-			proc_run(PRIORITY_LOW, "include/directory.php", $url);
+			Worker::add(PRIORITY_LOW, "directory", $url);
 		}
 	}
 
-	proc_run(PRIORITY_LOW, 'include/profile_update.php', local_user());
+	Worker::add(PRIORITY_LOW, 'profile_update', local_user());
 
 	// Update the global contact for the user
 	update_gcontact_for_user(local_user());
diff --git a/mod/tagger.php b/mod/tagger.php
index ea15b3f403..84e5e5615c 100644
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Core\Worker;
 
 require_once('include/security.php');
 require_once('include/bbcode.php');
@@ -214,7 +215,7 @@ EOT;
 
 	call_hooks('post_local_end', $arr);
 
-	proc_run(PRIORITY_HIGH, "include/notifier.php", "tag", $post_id);
+	Worker::add(PRIORITY_HIGH, "notifier", "tag", $post_id);
 
 	killme();
 
diff --git a/mod/videos.php b/mod/videos.php
index 09b44151d8..c75e8b943f 100644
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Core\Worker;
 
 require_once('include/items.php');
 require_once('include/acl_selectors.php');
@@ -170,7 +171,7 @@ function videos_post(App $a) {
 				$drop_id = intval($i[0]['id']);
 
 				if ($i[0]['visible']) {
-					proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $drop_id);
+					Worker::add(PRIORITY_HIGH, "notifier", "drop", $drop_id);
 				}
 			}
 		}
diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index 19a74aa4f5..5964f44046 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -10,7 +10,7 @@ use dba;
 use dbm;
 
 /**
- * @file include/Core/Worker.php
+ * @file src/Core/Worker.php
  *
  * @brief Contains the class for all worker relevant stuff
  */
@@ -34,15 +34,6 @@ class Worker {
 
 		self::$up_start = microtime(true);
 
-		// At first check the maximum load. We shouldn't continue with a high load
-		if ($a->maxload_reached()) {
-			logger('Pre check: maximum load reached, quitting.', LOGGER_DEBUG);
-			return;
-		}
-
-		// We now start the process. This is done after the load check since this could increase the load.
-		$a->start_process();
-
 		// Kill stale processes every 5 minutes
 		$last_cleanup = Config::get('system', 'poller_last_cleaned', 0);
 		if (time() > ($last_cleanup + 300)) {
@@ -212,7 +203,7 @@ class Worker {
 
 		// The script could be provided as full path or only with the function name
 		if ($include == basename($include)) {
-			$func = "include/".$include.".php";
+			$include = "include/".$include.".php";
 		}
 
 		if (!validate_include($include)) {
@@ -868,13 +859,13 @@ class Worker {
 		logger('Add cron entries', LOGGER_DEBUG);
 
 		// Check for spooled items
-		self::add(PRIORITY_HIGH, "include/spool_post.php");
+		self::add(PRIORITY_HIGH, "spool_post");
 
 		// Run the cron job that calls all other jobs
-		self::add(PRIORITY_MEDIUM, "include/cron.php");
+		self::add(PRIORITY_MEDIUM, "cron");
 
 		// Run the cronhooks job separately from cron for being able to use a different timing
-		self::add(PRIORITY_MEDIUM, "include/cronhooks.php");
+		self::add(PRIORITY_MEDIUM, "cronhooks");
 
 		// Cleaning dead processes
 		self::killStaleWorkers();
@@ -886,8 +877,8 @@ class Worker {
 	 * @param (integer|array) priority or parameter array, $cmd atrings are deprecated and are ignored
 	 *
 	 * next args are passed as $cmd command line
-	 * or: Worker::add(PRIORITY_HIGH, "include/notifier.php", "drop", $drop_id);
-	 * or: Worker::add(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), "include/create_shadowentry.php", $post_id);
+	 * or: Worker::add(PRIORITY_HIGH, "notifier", "drop", $drop_id);
+	 * or: Worker::add(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), "create_shadowentry", $post_id);
 	 *
 	 * @note $cmd and string args are surrounded with ""
 	 *
@@ -897,8 +888,6 @@ class Worker {
 	 * @return boolean "false" if proc_run couldn't be executed
 	 */
 	public static function add($cmd) {
-		$a = get_app();
-
 		$proc_args = func_get_args();
 
 		$args = array();
@@ -985,8 +974,7 @@ class Worker {
 
 		// Now call the poller to execute the jobs that we just added to the queue
 		$args = array("include/poller.php", "no_cron");
-
-		$a->proc_run($args);
+		get_app()->proc_run($args);
 
 		return true;
 	}
diff --git a/update.php b/update.php
index 413317f73b..db67d54600 100644
--- a/update.php
+++ b/update.php
@@ -2,6 +2,8 @@
 
 define('UPDATE_VERSION' , 1235);
 
+use Friendica\Core\Worker;
+
 /**
  *
  * update.php - automatic system update
@@ -1596,7 +1598,7 @@ function update_1169() {
 	if (!$r)
 		return UPDATE_FAILED;
 
-	proc_run(PRIORITY_LOW, "include/threadupdate.php");
+	Worker::add(PRIORITY_LOW, "threadupdate");
 
 	return UPDATE_SUCCESS;
 }
@@ -1637,7 +1639,7 @@ function update_1178() {
 		set_config('system','community_page_style', CP_NO_COMMUNITY_PAGE);
 
 	// Update the central item storage with uid=0
-	proc_run(PRIORITY_LOW, "include/threadupdate.php");
+	Worker::add(PRIORITY_LOW, "threadupdate");
 
 	return UPDATE_SUCCESS;
 }
@@ -1645,7 +1647,7 @@ function update_1178() {
 function update_1180() {
 
 	// Fill the new fields in the term table.
-	proc_run(PRIORITY_LOW, "include/tagupdate.php");
+	Worker::add(PRIORITY_LOW, "tagupdate");
 
 	return UPDATE_SUCCESS;
 }