Update for 2.0.0-beta.2