Updated for 3.0.0.M5 release