Refactored for wikipediabase instead of wikipediabasepy