Update for 1.0.0.M4