Added CPT capabilities