Update for 4.0.0.beta1