More work on spawner and layer association