Improved spawn generation