v3.0.0 changes

Reflects changes for v3.0.0