Update to v2.0