Added support for no webserver