Updated with new 2.0.0-beta4 changes.