Updated some missing CPA specifics