Added autostart support