new schema dumped direct from v2 database.