Added Autostart option