Improve daemon