VIMSYNC: adjust to new structure