Added option for spawning