Added autostart option