Changes from v1 to v2.