Updates for v2.0