Updated autostart mechanics