Updated for 3.0.0.CR1 release