Add support to NPC, one sample, and two-sample for 1e7
Add support to NPC, one sample, and two-sample for 1e7