Advanced villager sync changes