Initial support for persistence of v2