Spawner refactoring