Added Daemon support