Simplify autostart