Improved spawner functionality