Update for 1.0.0-rc.1, also simplify