Section 2 updates for v0.9.0 changes