Add option to disable the default collector

* More robust startup process