Optimized imports
Update to work with latest Wikibase