Added random NPC generator