Added autostart option support