Improved daemon mode