Ghost User
--- a/src/knot/server/zones.c
+++ b/src/knot/server/zones.c
+typedef struct {
+	const struct conf_t *config;
 	knot_nameserver_t *ns;
 	knot_zonedb_t *db_new;
 	pthread_mutex_t lock;
-	int inserted;
-	unsigned qhead;
-	unsigned qtail;
-	conf_zone_t *q[];
-
-};
+} zone_loader_ctx_t;

 /*! Thread entrypoint for loading zones. */
-static int zonewalker(dthread_t *thread)
+static int zones_loader_thread(dthread_t *thread)
--- a/src/knot/server/zones.c
+++ b/src/knot/server/zones.c
 		 * if the pointers match, remove the zone from old DB
 		 */
-		/*! \todo Find better way of removing zone with given pointer.*/
-		knot_zone_t *new_zone = (knot_zone_t *)(*hattrie_iter_val(i));
-		knot_zone_t *old_zone = knot_zonedb_find_zone(
-		                        db_old, knot_zone_name(new_zone));
-		if (old_zone == new_zone) {
-dbg_zones_exec(
-			char *name = knot_dname_to_str(knot_zone_name(old_zone));
-			dbg_zones_verb("zones: zone pointers match, removing zone %s "
-                                      "from database.\n", name);
-			free(name);
-);
-
+		old_zone = knot_zonedb_find_zone(db_old, knot_zone_name(new_zones[i]));
+		if (old_zone == new_zones[i]) {
--- a/src/libknot/dname.c
+++ b/src/libknot/dname.c

 bool knot_dname_is_equal(const knot_dname_t *d1, const knot_dname_t *d2)
 {
-	/*! \todo Could be implemented more efficiently, check profile first. */
--- a/src/libknot/zone/zonedb.c
+++ b/src/libknot/zone/zonedb.c
+	/* Name with more labels goes first. */
+	return b_labels - a_labels;
+}
+
+/*! \brief Find an equal name in sorted array (binary search). */
+#define ZONEDB_LEQ(arr,i,x) (knot_zonedb_cmp(((arr)[i])->name, (x)) <= 0)
+static long knot_zonedb_binsearch(knot_zone_t **arr, unsigned count,
+                                 const knot_dname_t *name)
+{
+	int k = BIN_SEARCH_FIRST_GE_CMP(arr, count, ZONEDB_LEQ, name) - 1;
+	if (k > -1 && knot_dname_is_equal(arr[k]->name, name)) {
+			return k;
+	}
+
+	return -1;
+
--- a/src/libknot/zone/zonedb.c
+++ b/src/libknot/zone/zonedb.c
 /* API functions                                                              */
 /*----------------------------------------------------------------------------*/

-knot_zonedb_t *knot_zonedb_new()
+knot_zonedb_t *knot_zonedb_new(unsigned size)
 {
-	knot_zonedb_t *db =
-		(knot_zonedb_t *)malloc(sizeof(knot_zonedb_t));
+	knot_zonedb_t *db = malloc(sizeof(knot_zonedb_t));
 	CHECK_ALLOC_LOG(db, NULL);

-	db->zone_tree = hattrie_create();
-	if (db->zone_tree == NULL) {
+	memset(db, 0, sizeof(knot_zonedb_t));
+	db->reserved = size;
+	db->array = malloc(size * sizeof(knot_zone_t*));
--- a/src/libknot/zone/zonedb.c
+++ b/src/libknot/zone/zonedb.c
 knot_zone_contents_t *knot_zonedb_expire_zone(knot_zonedb_t *db,
                                             const knot_dname_t *zone_name)
 {
+