Add NPC ID support