Changes for WikiImporter