Added daemon source and fixed dup problems