Update for v2.0.1-beta