Added new spawn wrapper and autostart options