Added "autostart" option