Add CPA without breaking the existing GA implementation for Legacy app