NPC support improvement