PPC: Refactoring to support subtarget feature changing