Added daemon mode too