Added CPA to the call and result classes