Move to use pf::CHI instead of directly CHI