Adapt WorldBank importer to new model