Improved NPC spawning system