Improve thread management and require autostart