Adapt to v2.