Updated for 3.0.0.M4 release