Update for v1.0-beta