[fea] pusub refactor