Updated to use 3.0.0.M3