Move the adding of entries to queue. Improves performance vastly