added Daemon infrastructure