Updating to v2.0.0