Updates for v4.0.0