[Remove CPT base] Support