diff --git a/schema/mysql/schema.sql b/schema/mysql/schema.sql
index a1db9908..bac8c5d3 100644
--- a/schema/mysql/schema.sql
+++ b/schema/mysql/schema.sql
@@ -188,6 +188,8 @@ CREATE TABLE host (
   check_interval int unsigned NOT NULL,
   check_retry_interval int unsigned NOT NULL,
 
+  affected_children int unsigned DEFAULT NULL,
+
   active_checks_enabled enum('n', 'y') NOT NULL,
   passive_checks_enabled enum('n', 'y') NOT NULL,
   event_handler_enabled enum('n', 'y') NOT NULL,
@@ -313,6 +315,8 @@ CREATE TABLE host_state (
 
   in_downtime enum('n', 'y') NOT NULL,
 
+  affects_children enum('n', 'y') NOT NULL DEFAULT 'n',
+
   execution_time int unsigned DEFAULT NULL,
   latency int unsigned DEFAULT NULL,
   check_timeout int unsigned DEFAULT NULL,
@@ -356,6 +360,8 @@ CREATE TABLE service (
   check_interval int unsigned NOT NULL,
   check_retry_interval int unsigned NOT NULL,
 
+  affected_children int unsigned DEFAULT NULL,
+
   active_checks_enabled enum('n', 'y') NOT NULL,
   passive_checks_enabled enum('n', 'y') NOT NULL,
   event_handler_enabled enum('n', 'y') NOT NULL,
@@ -482,6 +488,8 @@ CREATE TABLE service_state (
 
   in_downtime enum('n', 'y') NOT NULL,
 
+  affects_children enum('n', 'y') NOT NULL DEFAULT 'n',
+
   execution_time int unsigned DEFAULT NULL,
   latency int unsigned DEFAULT NULL,
   check_timeout int unsigned DEFAULT NULL,
@@ -1334,6 +1342,72 @@ CREATE TABLE sla_history_downtime (
   INDEX idx_sla_history_downtime_env_downtime_end (environment_id, downtime_end) COMMENT 'Filter for sla history retention'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC;
 
+
+CREATE TABLE `dependency` (
+  `id` binary(20) NOT NULL,
+  `environment_id` binary(20) NOT NULL,
+  `name` text NOT NULL,
+  `display_name` text NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC;
+
+-- TODO
+CREATE TABLE `dependency_state` (
+  `id` binary(20) NOT NULL,
+  `dependency_id` binary(20) NOT NULL,
+  `failed` enum('n', 'y') NOT NULL,
+  UNIQUE INDEX `dependency_state_dependency_id_uindex` (dependency_id),
+  KEY `dependency_state_dependency_id_fk` (`dependency_id`),
+  CONSTRAINT `dependency_state_dependency_id_fk` FOREIGN KEY (`dependency_id`) REFERENCES `dependency` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC;
+
+CREATE TABLE `redundancy_group` (
+  `id` binary(20) NOT NULL,
+  `environment_id` binary(20) NOT NULL,
+  `name` text NOT NULL,
+  `display_name` text NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC;
+
+-- TODO
+CREATE TABLE `redundancy_group_state` (
+  `id` binary(20) NOT NULL,
+  `redundancy_group_id` binary(20) NOT NULL,
+  `failed` enum('n', 'y') NOT NULL,
+  `last_state_change` bigint unsigned NOT NULL,
+  UNIQUE INDEX `redundancy_group_state_redundancy_group_id_uindex` (redundancy_group_id),
+  KEY `redundancy_group_state_redundancy_group_id_fk` (`redundancy_group_id`),
+  CONSTRAINT `redundancy_group_state_redundancy_group_id_fk` FOREIGN KEY (`redundancy_group_id`) REFERENCES `redundancy_group` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC;
+
+CREATE TABLE `dependency_node` (
+  `id` binary(20) NOT NULL,
+  `environment_id` binary(20) NOT NULL,
+  `host_id` binary(20) DEFAULT NULL,
+  `service_id` binary(20) DEFAULT NULL,
+  `redundancy_group_id` binary(20) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `dependency_node_host_id_service_id_uindex` (`host_id`,`service_id`),
+  KEY `dependency_node_redundancy_group_id_fk` (`redundancy_group_id`),
+  KEY `dependency_node_service_id_fk` (`service_id`),
+  CONSTRAINT `dependency_node_host_id_fk` FOREIGN KEY (`host_id`) REFERENCES `host` (`id`),
+  CONSTRAINT `dependency_node_redundancy_group_id_fk` FOREIGN KEY (`redundancy_group_id`) REFERENCES `redundancy_group` (`id`),
+  CONSTRAINT `dependency_node_service_id_fk` FOREIGN KEY (`service_id`) REFERENCES `service` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC;
+
+CREATE TABLE `dependency_edge` (
+  `environment_id` binary(20) NOT NULL,
+  `to_node_id` binary(20) NOT NULL,
+  `from_node_id` binary(20) NOT NULL,
+  `dependency_id` binary(20) DEFAULT NULL,
+  UNIQUE KEY `dependency_edge_to_node_id_from_node_id_uindex` (`to_node_id`,`from_node_id`),
+  KEY `dependency_edge_dependency_node_id_fk_2` (`from_node_id`),
+  KEY `dependency_edge_dependency_id_fk` (`dependency_id`),
+  CONSTRAINT `dependency_edge_dependency_id_fk` FOREIGN KEY (`dependency_id`) REFERENCES `dependency` (`id`),
+  CONSTRAINT `dependency_edge_dependency_node_id_fk` FOREIGN KEY (`to_node_id`) REFERENCES `dependency_node` (`id`),
+  CONSTRAINT `dependency_edge_dependency_node_id_fk_2` FOREIGN KEY (`from_node_id`) REFERENCES `dependency_node` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC;
+
 CREATE TABLE icingadb_schema (
   id int unsigned NOT NULL AUTO_INCREMENT,
   version smallint unsigned NOT NULL,
diff --git a/schema/mysql/upgrades/dependencies.sql b/schema/mysql/upgrades/dependencies.sql
deleted file mode 100644
index a4fecf52..00000000
--- a/schema/mysql/upgrades/dependencies.sql
+++ /dev/null
@@ -1,64 +0,0 @@
-CREATE TABLE `dependency` (
-  `id` binary(20) NOT NULL,
-  `environment_id` binary(20) NOT NULL,
-  `name` text NOT NULL,
-  `display_name` text NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC;
-
--- TODO
-CREATE TABLE `dependency_state` (
-  `id` binary(20) NOT NULL,
-  `dependency_id` binary(20) NOT NULL,
-  `failed` enum('n', 'y') NOT NULL,
-  UNIQUE INDEX `dependency_state_dependency_id_uindex` (dependency_id),
-  KEY `dependency_state_dependency_id_fk` (`dependency_id`),
-  CONSTRAINT `dependency_state_dependency_id_fk` FOREIGN KEY (`dependency_id`) REFERENCES `dependency` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC;
-
-CREATE TABLE `redundancy_group` (
-  `id` binary(20) NOT NULL,
-  `environment_id` binary(20) NOT NULL,
-  `name` text NOT NULL,
-  `display_name` text NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC;
-
--- TODO
-CREATE TABLE `redundancy_group_state` (
-  `id` binary(20) NOT NULL,
-  `redundancy_group_id` binary(20) NOT NULL,
-  `failed` enum('n', 'y') NOT NULL,
-  `last_state_change` bigint unsigned NOT NULL,
-  UNIQUE INDEX `redundancy_group_state_redundancy_group_id_uindex` (redundancy_group_id),
-  KEY `redundancy_group_state_redundancy_group_id_fk` (`redundancy_group_id`),
-  CONSTRAINT `redundancy_group_state_redundancy_group_id_fk` FOREIGN KEY (`redundancy_group_id`) REFERENCES `redundancy_group` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC;
-
-CREATE TABLE `dependency_node` (
-  `id` binary(20) NOT NULL,
-  `environment_id` binary(20) NOT NULL,
-  `host_id` binary(20) DEFAULT NULL,
-  `service_id` binary(20) DEFAULT NULL,
-  `redundancy_group_id` binary(20) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `dependency_node_host_id_service_id_uindex` (`host_id`,`service_id`),
-  KEY `dependency_node_redundancy_group_id_fk` (`redundancy_group_id`),
-  KEY `dependency_node_service_id_fk` (`service_id`),
-  CONSTRAINT `dependency_node_host_id_fk` FOREIGN KEY (`host_id`) REFERENCES `host` (`id`),
-  CONSTRAINT `dependency_node_redundancy_group_id_fk` FOREIGN KEY (`redundancy_group_id`) REFERENCES `redundancy_group` (`id`),
-  CONSTRAINT `dependency_node_service_id_fk` FOREIGN KEY (`service_id`) REFERENCES `service` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC;
-
-CREATE TABLE `dependency_edge` (
-  `environment_id` binary(20) NOT NULL,
-  `to_node_id` binary(20) NOT NULL,
-  `from_node_id` binary(20) NOT NULL,
-  `dependency_id` binary(20) DEFAULT NULL,
-  UNIQUE KEY `dependency_edge_to_node_id_from_node_id_uindex` (`to_node_id`,`from_node_id`),
-  KEY `dependency_edge_dependency_node_id_fk_2` (`from_node_id`),
-  KEY `dependency_edge_dependency_id_fk` (`dependency_id`),
-  CONSTRAINT `dependency_edge_dependency_id_fk` FOREIGN KEY (`dependency_id`) REFERENCES `dependency` (`id`),
-  CONSTRAINT `dependency_edge_dependency_node_id_fk` FOREIGN KEY (`to_node_id`) REFERENCES `dependency_node` (`id`),
-  CONSTRAINT `dependency_edge_dependency_node_id_fk_2` FOREIGN KEY (`from_node_id`) REFERENCES `dependency_node` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC;
diff --git a/schema/mysql/upgrades/dependencies3.sql b/schema/mysql/upgrades/dependencies3.sql
deleted file mode 100644
index f67f42ad..00000000
--- a/schema/mysql/upgrades/dependencies3.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-ALTER TABLE host
-    ADD COLUMN affected_children int unsigned DEFAULT NULL AFTER check_retry_interval;
-
-ALTER TABLE host_state
-    ADD COLUMN affects_children enum('n', 'y') NOT NULL DEFAULT 'n' AFTER in_downtime;
-
-ALTER TABLE service
-    ADD COLUMN affected_children int unsigned DEFAULT NULL AFTER check_retry_interval;
-
-ALTER TABLE service_state
-    ADD COLUMN affects_children enum('n', 'y') NOT NULL DEFAULT 'n' AFTER in_downtime;