Updates for CRS v3.0.0