Rework the daemon context