Updates for v3.0.0