Many API and CRP Changes