Update for 2.0.0-rc1