Further simplified CPT Class