diff --git a/ChangeLog.md b/ChangeLog.md
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,5 +1,11 @@
 # Changelog for fakedata
 
+## 0.2.2
+
+* Add meepoQuote function to the module Faker.Game.Dota
+* Add Faker.Music.Opera module
+* Update fake data source
+
 ## 0.2.1
 
 * Fix bug in Book module
diff --git a/fakedata.cabal b/fakedata.cabal
--- a/fakedata.cabal
+++ b/fakedata.cabal
@@ -1,13 +1,13 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.31.1.
+-- This file has been generated from package.yaml by hpack version 0.31.2.
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: a94da93c764c9d1455223f44b3b263abe47e9505f0c4b28f0ea2319a110ae01f
+-- hash: db840200e64e299010e5ca775abc4989422cf870d1b80c2af719438366539672
 
 name:           fakedata
-version:        0.2.1
+version:        0.2.2
 synopsis:       Library for producing fake data
 description:    Please see the README on GitHub at <https://github.com/psibi/fakedata#readme>
 category:       Random, Fake, FakeData
@@ -132,6 +132,7 @@
     faker/lib/locales/en/fresh_prince_of_bel_air.yml
     faker/lib/locales/en/friends.yml
     faker/lib/locales/en/funny_name.yml
+    faker/lib/locales/en/game.yml
     faker/lib/locales/en/game_of_thrones.yml
     faker/lib/locales/en/gender.yml
     faker/lib/locales/en/ghostbusters.yml
@@ -173,6 +174,7 @@
     faker/lib/locales/en/nato_phonetic_alphabet.yml
     faker/lib/locales/en/new_girl.yml
     faker/lib/locales/en/one_piece.yml
+    faker/lib/locales/en/opera.yml
     faker/lib/locales/en/overwatch.yml
     faker/lib/locales/en/parks_and_rec.yml
     faker/lib/locales/en/phish.yml
@@ -320,6 +322,7 @@
       Faker.Movie.StarWars
       Faker.Movie.VForVendetta
       Faker.Music
+      Faker.Music.Opera
       Faker.Music.Phish
       Faker.Music.RockBand
       Faker.Music.UmphreysMcgee
@@ -423,6 +426,7 @@
       Faker.Provider.NatoPhoneticAlphabet
       Faker.Provider.NewGirl
       Faker.Provider.OnePiece
+      Faker.Provider.Opera
       Faker.Provider.Overwatch
       Faker.Provider.ParksAndRec
       Faker.Provider.Phish
@@ -554,6 +558,7 @@
       GamesSpec
       InternalSpec
       NameSpec
+      OperaSpec
       OtherSpec
       ProviderSpec
       Paths_fakedata
diff --git a/faker/lib/locales/en/dc_comics.yml b/faker/lib/locales/en/dc_comics.yml
--- a/faker/lib/locales/en/dc_comics.yml
+++ b/faker/lib/locales/en/dc_comics.yml
@@ -5,7 +5,7 @@
       "Batman", "Superman", "Red Arrow", "Green Lantern", "Robin",
       "Nightwing", "The Flash", "Aquaman", "Green Arrow", "Captain Marvel",
       "Shazam", "Martain Manhunter", "Cyborg", "Hawkman", "Speedy", "Arsenal",
-      "Red Tornado","Booster Gold", "Doctor Fate", "Beast Boy", "Plastic Man",
+      "Red Tornado", "Booster Gold", "Doctor Fate", "Beast Boy", "Plastic Man",
       "Captain Atom", "Tempest", "Spectre", "Midnighter", "The Atom", "Kilowog",
       "Firestorm", "Blue Beetle", "Animal Man", "Mr. Miracle", "Wildcat",
       "Rorschach", "Dr. Manhattan", "Nite Owl", "The Comedian", "Azrael",
@@ -21,7 +21,7 @@
       villain: [
       "The Joker", "Lex Luthor", "Darkseid", "Sinestro", "Brainiac", "Black Adam",
       "Ras al Ghul", "Deathstroke", "Two-Face", "Doomsday", "Catwoman", "Mongul",
-      "Bizaroo", "Riddler", "Captain Cold", "Bane", "Harley Quinn", "Scarecrow",
+      "Bizarro", "Riddler", "Captain Cold", "Bane", "Harley Quinn", "Scarecrow",
       "Paralax", "Gorilla Grodd", "General Zod", "Black Manta", "Mr. Freeze",
       "Cheetah", "Amanda Waller", "Penguin", "Poison Ivy", "Solomon Grundy",
       "Parasite", "Krona", "Deadshot", "Metallo", "Lobo", "Eclipso", "Ares",
@@ -39,14 +39,14 @@
       ]
       title: [
       "The Sinestro Corps War", "The Coyote Gospel", "Green Arrow: The Longbow Hunters",
-      "Jla: Earth 2 ", "Identity Crisis", "Jla: Tower Of Babel", "Superman For All Seasons",
+      "JLA: Earth 2", "Identity Crisis", "JLA: Tower Of Babel", "Superman For All Seasons",
       "Superman: Red Son", "Batman: The Long Halloween", "Swamp Thing: The Anatomy Lesson",
-      "For The Man Who Has Everything", "Jack Kirby'S New Gods",
+      "For The Man Who Has Everything", "Jack Kirby's New Gods",
       "Arkham Asylum: A Serious House On Serious Earth", "Snowbirds Don't Fly",
       "Whatever Happened To The Man Of Tomorrow?", "The Killing Joke",
       "Teen Titans: The Judas Contract", "The New Frontier",
       "Kingdom Come", "Crisis On Infinite Earths",
       "Batman: Year One", "All Star Superman", "The Dark Knight Returns",
-      "Multiversity", "Gotham Central", "Grant Morrison'S Animal Man",
+      "Multiversity", "Gotham Central", "Grant Morrison's Animal Man",
       "Doom Patrol", "Action Comics", "Detective Comics"
       ]
diff --git a/faker/lib/locales/en/dota.yml b/faker/lib/locales/en/dota.yml
--- a/faker/lib/locales/en/dota.yml
+++ b/faker/lib/locales/en/dota.yml
@@ -2,7 +2,7 @@
   faker:
     games:
       dota:
-        hero: ["Abaddon", "Alchemist", "Axe", "Beastmaster", "Brewmaster", "Bristleback", "Centaur Warrunner", "Chaos Knight", "Clockwerk"]
+        hero: ["Abaddon", "Alchemist", "Axe", "Beastmaster", "Brewmaster", "Bristleback", "Centaur Warrunner", "Chaos Knight", "Clockwerk", "Meepo"]
         abaddon:
           quote: ["You have called death upon yourself.", "From House Avernus, I set forth.", "The mist chose me, it is not mine to command.", "To die at a noble hand is no guarantee of a noble death."]
         alchemist:
@@ -45,6 +45,8 @@
           quote: ["A wolf in man's clothing.", "Who fears the wolf should fear the forest.", "A peaceful man is but a patient wolf."]
         magnus:
           quote: ["Under my hoof you will find your fate.", "My horn is sharp, my pike is sharper still.", "Compared to my horn, all precious items are cheap."]
+        meepo:
+          quote: ["Got dirt between my toes.", "One paw in front of the other!", "What's up Meepo?", "Have shovel, will bury. You.", "They should call you Ain't-Mage.", "You punched out all of my blood!", "Try that again, tough guy!"]
         night_stalker:
           quote: ["Day walker, night stalker.", "Devil by day, demon by night.", "Flesh sustains, gold remains.", "I feed the darkness and the darkness feeds me."]
         omniknight:
diff --git a/faker/lib/locales/en/game.yml b/faker/lib/locales/en/game.yml
new file mode 100644
--- /dev/null
+++ b/faker/lib/locales/en/game.yml
@@ -0,0 +1,283 @@
+en:
+  faker:
+    game:
+      title:
+        - 'Half-Life'
+        - 'Half-Life: Opposing Force'
+        - 'Half-Life: Blue Shift'
+        - 'Half-Life 2'
+        - 'Half-Life 2: Episode One'
+        - 'Half-Life 2: Episode Two'
+        - 'Half-Life 2: Lost Coast'
+        - 'Portal'
+        - 'Portal 2'
+        - 'Team Fortress Classic'
+        - 'Team Fortress 2'
+        - 'Left 4 Dead'
+        - 'Left 4 Dead 2'
+        - 'Day of Defeat'
+        - 'Ricochet'
+        - 'Dota 2'
+        - 'Counter-Strike'
+        - 'Counter-Strike: Source'
+        - 'Counter-Strike: Global Offensive'
+        - "Garry's Mod"
+        - 'Super Mario Bros.'
+        - 'Super Mario Bros. 2'
+        - 'Super Mario Bros. 3'
+        - 'Super Mario World'
+        - 'Super Mario Sunshine'
+        - 'Super Mario Galaxy'
+        - 'Super Mario Galaxy 2'
+        - 'Super Mario Odyssey'
+        - 'Mario Kart 64'
+        - 'Mario Kart: Double Dash'
+        - 'Mario Kart DS'
+        - 'Mario Kart Wii'
+        - 'Mario Kart 7'
+        - 'Mario Kart 8'
+        - 'Mario Kart 8 Deluxe'
+        - "Luigi's Mansion"
+        - 'Animal Crossing'
+        - 'Animal Crossing: Wild World'
+        - 'Animal Crossing: City Folk'
+        - 'Animal Crossing: New Leaf'
+        - 'Civilization III'
+        - 'Civilization IV'
+        - 'Civilization V'
+        - 'Civilization VI'
+        - 'The Legend of Zelda'
+        - 'The Legend of Zelda: Ocarina of Time'
+        - "The Legend of Zelda: Majora's Mask"
+        - 'The Legend of Zelda: Twilight Princess'
+        - 'The Legend of Zelda: Skyward Sword'
+        - 'The Legend of Zelda: Breath of the Wild'
+        - 'Pong'
+        - 'Pac-Man'
+        - 'Starcraft'
+        - 'Starcraft II'
+        - 'Overwatch'
+        - 'Hearthstone'
+        - 'Halo: Combat Evolved'
+        - 'Halo 2'
+        - 'Halo 3'
+        - 'Halo 3: ODST'
+        - 'Halo: Reach'
+        - 'Halo 4'
+        - 'Halo 5: Guardians'
+        - 'Wii Sports'
+        - 'Wii Sports Resort'
+        - 'Wii Play'
+        - 'Wii Music'
+        - 'Pokémon Red'
+        - 'Pokémon Blue'
+        - 'Pokémon Yellow'
+        - 'Pokémon Gold'
+        - 'Pokémon Silver'
+        - 'Pokémon Crystal'
+        - 'Pokémon Ruby'
+        - 'Pokémon Sapphire'
+        - 'Pokémon FireRed'
+        - 'Pokémon LeafGreen'
+        - 'Pokémon Emerald'
+        - 'Pokémon Diamond'
+        - 'Pokémon Pearl'
+        - 'Pokémon Platinum'
+        - 'Pokémon HeartGold'
+        - 'Pokémon SoulSilver'
+        - 'Pokémon Black'
+        - 'Pokémon White'
+        - 'Pokémon Black 2'
+        - 'Pokémon White 2'
+        - 'Pokémon X'
+        - 'Pokémon Y'
+        - 'Pokémon Omega Ruby'
+        - 'Pokémon Alpha Sapphire'
+        - 'Pokémon Sun'
+        - 'Pokémon Moon'
+        - 'Pokémon Ultra Sun'
+        - 'Pokémon Ultra Moon'
+        - "Pokémon: Let's Go Pikachu!"
+        - "Pokémon: Let's Go Eevee!"
+        - 'Pokémon Sword'
+        - 'Pokémon Shield'
+        - 'Doom'
+        - 'Doom II'
+        - 'Doom 3: BFG'
+        - 'Quake'
+        - 'Wolfenstein 3D'
+        - 'Wolfenstein: The New Order'
+        - 'Wolfenstein: The Old Blood'
+        - 'Wolfenstein 2: The New Colossus'
+        - 'Puyo Puyo Tetris'
+        - 'Katamari Damacy'
+        - 'Bastion'
+        - 'Transistor'
+        - 'System Shock'
+        - 'BioShock'
+        - 'BioShock Infinite'
+        - 'Deus Ex'
+        - 'Metroid Prime'
+        - 'Metroid Prime 2: Echoes'
+        - 'Metroid Prime 3: Corruption'
+        - 'Super Meat Boy'
+        - 'Super Smash Bros. Brawl'
+        - 'Super Smash Bros. Melee'
+        - 'Super Smash Bros. Ultimate'
+        - 'Thief II'
+        - 'Vampire: The Masquerade – Bloodlines'
+        - 'Myst'
+        - 'Batman: Arkham Asylum'
+        - 'Batman: Arkham City'
+        - 'Dishonored'
+        - 'God of War'
+        - 'LittleBigPlanet'
+        - 'Grim Fandango'
+        - 'Day of the Tentacle'
+        - 'Kingdom Hearts'
+        - 'Kingdom Hearts II'
+        - 'The Last of Us'
+        - 'Perfect Dark'
+        - 'Shadow of the Colossus'
+        - 'Fallout: New Vegas'
+        - 'Fire Emblem Awakening'
+        - "Banjo-Kazooie: Grunty's Revenge"
+        - 'Banjo-Kazooie: Nuts & Bolts'
+        - 'Firewatch'
+        - 'Mass Effect'
+        - 'Mass Effect 2'
+        - 'Mass Effect 3'
+        - 'Mega Man'
+        - 'Mega Man Battle Network'
+        - 'Bayonetta'
+        - 'Bayonetta 2'
+        - 'The Wonderful 101'
+        - 'Sleeping Dogs'
+        - 'Battletoads'
+        - 'Brütal Legend'
+        - 'Halo Wars'
+        - 'Clannad'
+        - 'Highway Blossoms'
+        - 'Infamous'
+        - 'Crash Bandicoot'
+        - 'Just Cause'
+        - 'Just Cause 2'
+        - 'Devil May Cry'
+        - 'Life is Strange'
+        - 'WarioWare: Smooth Moves'
+        - 'WarioWare: Touched!'
+        - 'Dwarf Fortress'
+        - 'Dungeon Keeper'
+        - 'Minecraft'
+        - 'Fortnite'
+        - "PlayerUnknown's Battlegrounds"
+        - "Kirby's Adventure"
+        - "Kirby's Dream Land"
+        - "Kirby's Epic Yarn"
+        - "Yoshi's Wooly World"
+        - 'L.A. Noire'
+        - 'Kid Icarus'
+        - 'Ice Climbers'
+        - 'Crysis'
+        - 'Crysis 2'
+        - 'Hitman: Absolution'
+        - 'Metal Gear Solid'
+        - 'F-Zero'
+        - 'F.E.A.R.'
+        - 'Max Payne'
+        - 'Max Payne 2: The Fall of Max Payne'
+        - 'Max Payne 3'
+        - 'Far Cry'
+        - 'Castle Crashers'
+        - 'Sonic Unleashed'
+        - "Mirror's Edge"
+        - 'The Witcher'
+        - 'The Witcher 2: Assassins of Kings'
+        - 'The Witcher 3: Wild Hunt'
+        - 'Monster Hunter: World'
+        - 'Call of Duty'
+        - 'Call of Duty 4: Modern Warfare'
+        - 'Call of Duty: Modern Warfare Remastered'
+        - 'Call of Duty: Modern Warfare 2'
+        - 'Call of Duty: Modern Warfare 3'
+        - 'Call of Duty: World at War'
+        - 'Call of Duty: Black Ops'
+        - 'Call of Duty: Black Ops II'
+        - 'Call of Duty: Black Ops III'
+        - 'Call of Duty: Black Ops 4'
+        - 'Shadow Tactics: Blade of the Shogun'
+        - 'Commandos: Behind Enemy Lines'
+        - 'Commandos: Beyond the Call of Duty'
+        - 'Commandos 2: Men of Courage'
+        - 'Commandos 3: Destination Berlin'
+        - 'Commandos: Strike Force'
+        - 'Desperados: Wanted Dead or Alive'
+        - "Desperados 2: Cooper's Revenge"
+        - 'Helldorado'
+        - 'Desperados III'
+        - 'Diablo'
+        - 'Diablo II'
+        - 'Diablo III'
+        - 'Guitar Hero'
+      genre:
+        - 'First-person shooter'
+        - 'Puzzle'
+        - 'Platformer'
+        - 'Action'
+        - 'Adventure'
+        - 'Real-time strategy'
+        - 'Action role-playing'
+        - 'Dungeon crawl'
+        - 'Roguelike'
+        - 'Tactical role-playing'
+        - 'Sports'
+        - 'Simulation'
+        - 'Fighting'
+        - 'Massively multiplayer online'
+        - 'Stealth'
+        - 'Survival'
+        - 'Rhythm'
+        - 'Survival horror'
+        - 'Text adventure'
+        - 'Visual novel'
+        - 'Real-time strategy'
+        - 'Multiplayer online battle arena'
+        - 'Tower defense'
+        - 'Trivia'
+        - 'Real-time tactics'
+        - 'Hack and slash'
+        - 'Battle royale'
+        - 'Third-person shooter'
+        - 'Music'
+      platform:
+        - 'Xbox'
+        - 'Xbox 360'
+        - 'Xbox One'
+        - 'PlayStation'
+        - 'PlayStation 2'
+        - 'PlayStation 3'
+        - 'PlayStation 4'
+        - 'PlayStation Portable'
+        - 'PlayStation Vita'
+        - 'Game Boy'
+        - 'Game Boy Color'
+        - 'Game Boy Advance'
+        - 'Nintendo DS'
+        - 'Nintendo DSi'
+        - 'Nintendo 3DS'
+        - 'Nintendo Entertainment System'
+        - 'Super Nintendo Entertainment System'
+        - 'Nintendo 64'
+        - 'GameCube'
+        - 'Wii'
+        - 'Wii U'
+        - 'Nintendo Switch'
+        - 'Windows'
+        - 'macOS'
+        - 'Linux'
+        - 'Sega Genesis'
+        - 'Sega Master System'
+        - 'Game Gear'
+        - 'Sega Saturn'
+        - 'Sega Dreamcast'
+        - 'Virtual Boy'
diff --git a/faker/lib/locales/en/heroes_of_the_storm.yml b/faker/lib/locales/en/heroes_of_the_storm.yml
--- a/faker/lib/locales/en/heroes_of_the_storm.yml
+++ b/faker/lib/locales/en/heroes_of_the_storm.yml
@@ -2,6 +2,6 @@
   faker:
     heroes_of_the_storm:
       battlegrounds: ["Alterac Pass", "Battlefield of Eternity", "Blackheart's Bay", "Braxis Holdout", "Cursed Hollow", "Dragon Shire", "Garden of Terror", "Hanamura Temple", "Haunted Mines", "Infernal Shrines", "Sky Temple", "Tomb of the Spider Queen", "Towers of Doom", "Volskaya Foundry", "Warhead Junction"]
-      classes: ["Assasin", "Multiclass", "Specialist", "Support", "Warrior"]
-      heroes: ["Abathur", "Alarak", "Alexstrasza", "Ana", "Anub'arak", "Artanis", "Arthas", "Auriel", "Azmodan", "Blaze", "Brightwing", "Cassia", "Chen", "Cho", "Chromie", "D.Va", "Deckard", "Dehaka", "Diablo", "E.T.C.", "Falstad", "Fenix", "Gall", "Garrosh", "Gazlowe", "Genji", "Greymane", "Gul'dan", "Hanzo", "Illidan", "Jaina", "Johanna", "Junkrat", "Kael'thas", "Kel'Thuzad", "Kerrigan", "Kharazim", "Leoric", "Li Li", "Li-Ming", "Lt. Morales", "Lunara", "Lúcio", "Maiev", "Mal'Ganis", "Malfurion", "Malthael", "Medivh", "Mephisto", "Muradin", "Murky", "Nazeebo", "Nova", "Orphea", "Probius", "Ragnaros", "Raynor", "Rehgar", "Rexxar", "Samuro", "Sgt. Hammer", "Sonya", "Stitches", "Stukov", "Sylvanas", "Tassadar", "The Butcher", "The Lost Vikings", "Thrall", "Tracer", "Tychus", "Tyrael", "Tyrande", "Uther", "Valeera", "Valla", "Whitemane", "Xul", "Yrel", "Zagara", "Zarya", "Zeratul", "Zul'jin"]
+      classes: ["Bruiser", "Healer", "Melee Assassin", "Ranged Assassin", "Support", "Tank"]
+      heroes: ["Abathur", "Alarak", "Alexstrasza", "Ana", "Anduin", "Anub'arak", "Artanis", "Arthas", "Auriel", "Azmodan", "Blaze", "Brightwing", "Cassia", "Chen", "Cho", "Chromie", "D.Va", "Deckard", "Dehaka", "Diablo", "E.T.C.", "Falstad", "Fenix", "Gall", "Garrosh", "Gazlowe", "Genji", "Greymane", "Gul'dan", "Hanzo", "Illidan", "Imperius", "Jaina", "Johanna", "Junkrat", "Kael'thas", "Kel'Thuzad", "Kerrigan", "Kharazim", "Leoric", "Li Li", "Li-Ming", "Lt. Morales", "Lunara", "Lúcio", "Maiev", "Mal'Ganis", "Malfurion", "Malthael", "Medivh", "Mephisto", "Muradin", "Murky", "Nazeebo", "Nova", "Orphea", "Probius", "Ragnaros", "Raynor", "Rehgar", "Rexxar", "Samuro", "Sgt. Hammer", "Sonya", "Stitches", "Stukov", "Sylvanas", "Tassadar", "The Butcher", "The Lost Vikings", "Thrall", "Tracer", "Tychus", "Tyrael", "Tyrande", "Uther", "Valeera", "Valla", "Whitemane", "Xul", "Yrel", "Zagara", "Zarya", "Zeratul", "Zul'jin"]
       quotes: ["Beat them like they owe you money!", "Careful wizard, your kind has upset the balance beforeo I become re-dead? Deader? ... Alive?\"", "Don't forget to check the pocket!", "Have you ever considered aiming anywhere other than the face?", "Hey, you look like the cover of E.T.C.s new album!", "Human words are hard to make together talking for expressing... things!", "I like happy things! Like puppies, and rainbows, and dead enemies!", "I must leave and I blame this failure upon you.", "Mrgrgrlrgrlgr!!!", "Oh my God, I can't believe I just killed a panda.", "Taunting life form; you are weak! And physically unappealing!", "Teammates. Much to improve.\" is a pretty good contender.", "That was easy! You were easy to kill!", "This will only hurt until you die.", "Ugh, I've known much better healers.", "We drink first blood!", "You look like you could actually be of use here!", "You might be a king, or just a street sweeper... yet sooner or later you dance with the reaper.", "You see this hero yes? Then kill them!", "You think us fools?", "You waste both my time and your breath, and the former has value."]
diff --git a/faker/lib/locales/en/league_of_legends.yml b/faker/lib/locales/en/league_of_legends.yml
--- a/faker/lib/locales/en/league_of_legends.yml
+++ b/faker/lib/locales/en/league_of_legends.yml
@@ -2,9 +2,9 @@
   faker:
     games:
       league_of_legends:
-        champion: ["Aatrox", "Ahri", "Akali", "Alister", "Amumu", "Anivia", "Annie", "Ashe", "Aurelion Sol", "Azir", "Bard", "Blitzcrank", "Brand", "Braum", "Caitlyn", "Camille", "Cassiopeia", "Cho-Gath", "Corki", "Darius", "Diana", "Dr. Mundo", "Draven", "Ekko", "Elise", "Evelynn", "Ezreal", "Fiddlesticks", "Fiora", "Fizz", "Galio", "Gangplank", "Garen", "Gnar", "Gragas", "Graves", "Hecarim", "Heimerdinger", "Illaoi", "Irelia", "Ivern", "Janna", "Jarvan IV", "Jax", "Jayce", "Jhin", "Jinx", "Kalista", "Karma", "Karthus", "Kassadin", "Katarina", "Kayle", "Kennen", "Kha'Zix", "Kindred", "Kled", "Kog'Maw", "LeBlanc", "Lee Sin", "Leona", "Lissandra", "Lucian", "Lulu", "Lux", "Malphite", "Malzahar", "Maokai", "Master Yi", "Miss Fortune", "Mordekaiser", "Morgana", "Nami", "Nasus", "Nautilus", "Nidalee", "Nocturne", "Nunu", "Olaf", "Orianna", "Pantheon", "Poppy", "Quinn", "Rammus", "Rek'Sai", "Renekton", "Rengar", "Riven", "Rakan", "Rumble", "Ryze", "Sejuani", "Shaco", "Shen", "Shyvanna", "Singed", "Sion", "Sivir", "Skarner", "Sona", "Soraka", "Swain", "Syndra", "Tahm Kench", "Taliyah", "Talon", "Taric", "Teemo", "Thresh", "Tristana", "Trundle", "Tryndamere", "Twisted Fate", "Twitch", "Udyr", "Urgot", "Varus", "Vayne", "Veigar", "Vel'Koz", "Vi", "Viktor", "Vladimir", "Volibear", "Warwick", "Wukong", "Xayah", "Xerath", "Xin Zhao", "Yasuo", "Yorick", "Zac", "Zed", "Ziggs", "Zilean", "Zyra"]
+        champion: ["Aatrox", "Ahri", "Akali", "Alister", "Amumu", "Anivia", "Annie", "Ashe", "Aurelion Sol", "Azir", "Bard", "Blitzcrank", "Brand", "Braum", "Caitlyn", "Camille", "Cassiopeia", "Cho-Gath", "Corki", "Darius", "Diana", "Dr. Mundo", "Draven", "Ekko", "Elise", "Evelynn", "Ezreal", "Fiddlesticks", "Fiora", "Fizz", "Galio", "Gangplank", "Garen", "Gnar", "Gragas", "Graves", "Hecarim", "Heimerdinger", "Illaoi", "Irelia", "Ivern", "Janna", "Jarvan IV", "Jax", "Jayce", "Jhin", "Jinx", "Kai'Sa", "Kalista", "Karma", "Karthus", "Kassadin", "Katarina", "Kayle", "Kayn", "Kennen", "Kha'Zix", "Kindred", "Kled", "Kog'Maw", "LeBlanc", "Lee Sin", "Leona", "Lissandra", "Lucian", "Lulu", "Lux", "Malphite", "Malzahar", "Maokai", "Master Yi", "Miss Fortune", "Mordekaiser", "Morgana", "Neeko", "Nami", "Nasus", "Nautilus", "Nidalee", "Nocturne", "Nunu & Willump", "Olaf", "Orianna", "Ornn", "Pantheon", "Poppy", "Pyke", "Quinn", "Rammus", "Rek'Sai", "Renekton", "Rengar", "Riven", "Rakan", "Rumble", "Ryze", "Sejuani", "Shaco", "Shen", "Shyvanna", "Singed", "Sion", "Sivir", "Skarner", "Sona", "Soraka", "Swain", "Sylas", "Syndra", "Tahm Kench", "Taliyah", "Talon", "Taric", "Teemo", "Thresh", "Tristana", "Trundle", "Tryndamere", "Twisted Fate", "Twitch", "Udyr", "Urgot", "Varus", "Vayne", "Veigar", "Vel'Koz", "Vi", "Viktor", "Vladimir", "Volibear", "Warwick", "Wukong", "Xayah", "Xerath", "Xin Zhao", "Yasuo", "Yorick", "Yuumi", "Zac", "Zed", "Ziggs", "Zilean", "Zoe", "Zyra"]
         location: ["Demacia", "Noxus", "Shadow Isles", "Valoran", "Runeterra", "Bandle City", "Bilgewater", "Freljord", "Ionia", "Mount Targon", "Piltover", "Lokfar", "Zaun"]
         quote: ["Purge the unjust.", "By my will, this shall be finished!", "You only have to click once, fool!", "My right arm is a lot stronger than my left.", "Ready to set the world on fire...", "The early bird guts the worm!", "Don't you trust me?", "Welcome to Summoners Rift!", "Have you seen my Bear Tibbers?", "NOM NOM NOM", "Defy Noxus and taste your own blood.", "Behold the might of the shadow isles.", "Who wants a piece of the champ?!", "Come on, live a little... while you can!", "Master yourself, master the enemy.", "Blindness is no impairment against a smelly enemy.", "ok.", "Caught between a rock... and a hard place.", "Mundo will go where he pleases!", "Mundo say his own name a lot, or else he forget! Has happened before.", "A man, a woman and a yordle walk into the sun. They die! Because it burns them alive? heh heh heh heh", "The cycle of life and death continues. We will live, they will die.", "My profession?! You know, now that I think of it, I've always wanted to be a baker.", "Tonight we hunt!", "Monsters can be made to fear.", "How about a drink?", "Captain Teemo on duty.", "Hut, two, three, four. Yes, sir!", "I'll scout ahead!", "That's gotta sting.", "Never underestimate the power of the Scout's code.", "I suppose you're expecting some inBEARable pun?", "It's not how much you can lift. It's how good you look!", "Welcome to the League of Draven.", "Not Draven; Draaaaven.", "Who wants some Draven? Heheheh.", "Subtle? I don't do subtle."]
         summoner_spell: ["Teleport", "Exhaust", "Barrier", "Smite", "Flash", "Ignite", "Clarity", "Mark", "To the King!", "Ghost", "Heal", "Poro Toss", "Cleanse"]
         masteries: ["Battle Trance", "Double Edged Sword", "Bounty Hunter", "Fresh Blood", "Expose Weakness", "Feast", "Warlord's Bloodlust", "Fervor of Battle", "Deathfire Touch", "Greenfather's Gift", "Dangerous Game", "Bandit", "Courage of the Colossus", "Stoneborn Pact", "Grasp of the Undying", "Siegemaster", "Tough Skin", "Explorer", "Assassin", "Secret Stash", "Runic Affinity", "Windspeaker's Blessing", "Thunderlord's Decree", "Stormraider's Surge", "Fearless", "Unyielding", "Meditation", "Battering Blows", "Piercing Thoughts", "Insight", "Perseverance", "Intelligence", "Precision", "Sorcery", "Vampirism", "Fury", "Natural Talent", "Savagery", "Wanderer", "Merciless", "Recovery", "Legendary Guardian", "Swiftness", "Runic Armor", "Veteran's Scars"]
-        rank: ["Bronze V", "Bronze IV", "Bronze III", "Bronze II", "Bronze I", "Silver V", "Silver IV", "Silver III", "Silver II", "Silver I", "Gold V", "Gold IV", "Gold III", "Gold II", "Gold I", "Platinum V", "Platinum IV", "Platinum III", "Platinum II", "Platinum I", "Diamond V", "Diamond IV", "Diamond III", "Diamond II", "Diamond I", "Master", "Challenger"]
+        rank: ["Iron IV", "Iron III", "Iron II", "Iron I", "Bronze IV", "Bronze III", "Bronze II", "Bronze I", "Silver IV", "Silver III", "Silver II", "Silver I", "Gold IV", "Gold III", "Gold II", "Gold I", "Platinum IV", "Platinum III", "Platinum II", "Platinum I", "Diamond IV", "Diamond III", "Diamond II", "Diamond I", "Master", "Grandmaster", "Challenger"]
diff --git a/faker/lib/locales/en/music.yml b/faker/lib/locales/en/music.yml
--- a/faker/lib/locales/en/music.yml
+++ b/faker/lib/locales/en/music.yml
@@ -26,7 +26,7 @@
       "The Eminem Show", "Hybrid Theory", "Come Away with Me", "Unplugged", "True Blue", "Legend: The Best of Bob Marley & The Wailers", "Tapestry", "No Jacket Required", "Greatest Hits",
       "Bridge over Troubled Water", "The Joshua Tree", "...Baby One More Time", "Backstreet's Back", "Backstreet Boys", "Millennium", "Spice", "Happy Nation", "The Sign", "Whitney Houston",
       "(What's the Story) Morning Glory?", "The Marshall Mathers LP", "Like a Virgin", "Cross Road", "25", "Boston", "Oops!... I Did It Again", "The Colour of My Love", "Hysteria", "Faith",
-      "Dookie", "Can't Slow Down", "Daydream", "HIStory: Past", " Present and Future", " Book I", "Off the Wall", "The Woman in Me", "Breakfast in America", "Tracy Chapman",
+      "Dookie", "Can't Slow Down", "Daydream", "HIStory: Past, Present and Future, Book I", "Off the Wall", "The Woman in Me", "Breakfast in America", "Tracy Chapman",
       "Flashdance: Original Soundtrack from the Motion Picture", "Whitney", "Confessions", "X&Y", "High School Musical", "High School Musical 2", "Viva la Vida or Death and All His Friends",
       "I Dreamed a Dream", "Recovery", "Midnight Memories", "Frozen", "Lemonade", "Brand New Eyes", "All We Know Is Falling", "Riot!", "Songs About Jane", "Hands All Over"]
       genres: ["Rock", "Pop", "Electronic", "Folk", "World", "Country", "Jazz", "Funk", "Soul", "Hip Hop", "Classical", "Latin", "Reggae", "Stage And Screen", "Blues", "Non Music", "Rap"]
diff --git a/faker/lib/locales/en/opera.yml b/faker/lib/locales/en/opera.yml
new file mode 100644
--- /dev/null
+++ b/faker/lib/locales/en/opera.yml
@@ -0,0 +1,172 @@
+en:
+  faker:
+    opera:
+      italian:
+        by_giuseppe_verdi:
+          - Oberto Conte di San Bonifacio
+          - Un Giorno di Regno
+          - Nabucco
+          - Lombardi alla Prima Crociata
+          - Ernani
+          - I due Foscari
+          - Giovanna d'Arco
+          - Alzira
+          - Attila
+          - Macbeth
+          - I Masnadieri
+          - Jérusalem
+          - Il Corsaro
+          - La Battaglia di Legnano
+          - Luisa Miller
+          - Stiffelio
+          - Rigoletto
+          - Il Trovatore
+          - Simon Boccanegra
+          - Aroldo
+          - Un Ballo in Maschera
+          - La Forza del Destino
+          - Don Carlos
+          - Aida
+          - Otello
+          - Falstaff
+          - I Vespri Siciliani
+          - La Traviat
+        by_gioacchino_rossini:
+          - Demetrio e Polibio
+          - La cambiale di matrimonio
+          - L'equivoco stravagante
+          - L'inganno felice
+          - Ciro in Babilonia ossia La caduta di Baldassare
+          - La scala di seta
+          - La pietra del paragone
+          - L'occasione fa il ladro  ossia Il cambio della valigia
+          - Il signor Bruschino   ossia Il figlio per azzardo
+          - Tancredi
+          - L'italiana in Algeri
+          - Aureliano in Palmira
+          - Il turco in Italia
+          - Sigismondo
+          - Elisabetta   regina d'Inghilterra
+          - Torvaldo e Dorliska
+          - Il barbiere di Siviglia   ossia L'inutile precauzione
+          - La gazzetta   ossia Il matrimonio per concorso
+          - Otello   ossia Il Moro di Venezia
+          - La Cenerentola   ossia La bontà in trionfo
+          - La gazza ladra
+          - Armida
+          - Adelaide di Borgogna ossia Ottone re d'Italia
+          - Mosè in Egitto
+          - Adina ossia Il califfo di Bagdad
+          - Ricciardo e Zoraide
+          - Ermione
+          - Eduardo e Cristina
+          - La donna del lago
+          - Bianca e Falliero ossia Il consiglio dei tre
+          - Maometto II
+          - Matilde di Shabran
+          - Zelmira
+          - Semiramide
+          - Ugo   re d'Italia
+          - Il viaggio a Reims   ossia L'albergo del Giglio d'Oro
+          - Le siège de Corinthe
+          - Moïse et Pharaon ou Le passage de la mer rouge
+          - Le comte Ory
+          - Guillaume Tell
+        by_gaetano_donizetti:
+          - Olimpiade
+          - L'ira di Achille
+          - Enrico di Borgogna
+          - Una follia
+          - I piccioli virtuosi ambulanti
+          - Il falegname di Livonia o Pietro il grande czar delle Russie
+          - Le nozze in villa
+          - Zoraida di Granata
+          - La zingara
+          - La lettera anonima
+          - Chiara e Serafina o Il pirata
+          - Alfredo il grande
+          - Il fortunato inganno
+          - L'ajo nell'imbarazzo
+          - Emilia di Liverpool or L'eremitaggio di Liverpool
+          - Alahor in Granata
+          - Don Gregorio
+          - Elvida
+          - Gabriella di Vergy
+          - Olivo e Pasquale
+          - Otto mesi in due ore ossia Gli esiliati in Siberia
+          - Il borgomastro di Saardam
+          - Le convenienze teatrali
+          - L'esule di Roma ossia Il proscritto
+          - L'eremitaggio di Liverpool
+          - Alina regina di Golconda
+          - Gianni di Calais
+          - Il paria
+          - Il giovedì grasso o Il nuovo Pourceaugnac
+          - Elisabetta al castello di Kenilworth
+          - Alina regina di Golconda[rev]
+          - I pazzi per progetto
+          - Il diluvio universale
+          - Imelda de' Lambertazzi
+          - Anna Bolena
+          - Gianni di Parigi
+          - Le convenienze ed inconvenienze teatrali
+          - Francesca di Foix
+          - La romanziera e l'uomo nero
+          - Fausta
+          - Ugo conte di Parigi
+          - L'elisir d'amore
+          - Sancia di Castiglia
+          - Il furioso all'isola di San Domingo
+          - Otto mesi in due ore
+          - Parisina
+          - Torquato Tasso
+          - Lucrezia Borgia
+          - Il diluvio universale
+          - Rosmonda d'Inghilterra
+          - Maria Stuarda
+          - Buondelmonte
+          - Gemma di Vergy
+          - Marino Faliero
+          - Lucia di Lammermoor
+          - Belisario
+          - Il campanello di notte
+          - Betly o La capanna svizzera
+          - L'assedio di Calais
+          - Pia de' Tolomei
+          - Pia de' Tolomei
+          - Betly
+          - Roberto Devereux
+          - Maria de Rudenz
+          - Gabriella di Vergy
+          - Poliuto
+          - Pia de' Tolomei
+          - Lucie de Lammermoor
+          - Le duc d'Albe
+          - L'ange de Nisida
+          - Lucrezia Borgia
+          - Les Martyrs
+          - La fille du régiment
+          - Lucrezia Borgia
+          - La favorite
+          - Adelia
+          - Rita
+          - Maria Padilla
+          - Linda di Chamounix
+          - Caterina Cornaro
+          - Don Pasquale
+          - Maria di Rohan
+          - Dom Sébastien roi de Portugal
+          - Dom Sebastian von Portugal
+          - Il duca d'Alba
+        by_vincenzo_bellini:
+          - Adelson e Salvini
+          - Bianca e Gernando
+          - Il pirata
+          - Bianca e Fernando
+          - La straniera
+          - Zaira
+          - I Capuleti e i Montecchi
+          - La sonnambula
+          - Norma
+          - Beatrice di Tenda
+          - I puritani
diff --git a/faker/lib/locales/en/phish.yml b/faker/lib/locales/en/phish.yml
--- a/faker/lib/locales/en/phish.yml
+++ b/faker/lib/locales/en/phish.yml
@@ -1,4 +1,4 @@
 en:
   faker:
     phish:
-      song: ["A Song I Heard the Ocean Sing", "AC/DC Bag", "Access Me", "Acoustic Army", "Aftermath", "Alaska", "Albert", "All of These Dreams", "All Things Reconsidered", "Alumni Blues", "Anarchy", "And So To Bed", "Anything But Me", "Architect", "Army of One", "At the Barbecue", "Avenu Malkenu", "Axilla", "Axilla Part II", "Babylon Baby", "Back on the Train", "Backwards Down the Number Line", "Backwards Food for Backwards Folks", "Bathtub Gin", "Beauty of a Broken Heart", "Big Ball Jam", "Big Black Furry Creature from Mars", "Billy Breathes", "Birds of a Feather", "The Birdwatcher", "Bittersweet Motel", "Bliss", "Blue Over Yellow", "Bouncing Around the Room", "Brian and Robert", "Brother", "Bubble Wrap", "Bug", "Buried Alive", "Burn That Bridge", "Bye Bye Foot", "Camel Walk", "Can't Come Back", "Carini", "Cars Trucks Buses", "Catapult", "The Cataract Song", "Cavern", "Chalkdust Torture", "Character Zero", "Clone", "Colonel Forbin's Ascent", "TheConnection", "Contact", "Crowd Control", "The Curtain", "The Curtain With", "Dave's Energy Guide", "David Bowie", "Dear Mrs. Reagan", "Demand", "Den of Iniquity", "Destiny Unbound", "Dinner and a Movie", "Dirt", "Discern", "The Divided Sky", "Dog Faced Boy", "Dog Log", "Dogs Stole Things", "Don't Get Me Wrong", "Down With Disease", "Dr. Gabel", "Drifting", "Driver", "Eliza", "End of Session", "Esther", "Faht", "Farmhouse", "Fast Enough for You", "Fee", "Fikus", "Final Flight", "First Tube", "Fish Bass", "Flat Fee", "Fluff's Travels", "Fluffhead", "Fly Famous Mockingbird", "Foam", "Frankie Says", "Free", "Friday", "Fuck Your Face", "Gatekeeper", "Ghost", "Glide", "Glide II", "Golgi Apparatus", "Gone", "Gotta Jibboo", "Grind", "Guantanamo Strut", "Guelah Papyrus", "Gumbo", "Guy Forget", "Guyute", "Ha Ha Ha", "Halfway to the Moon", "Halley's Comet", "The Happy Whip and Dung Song", "Harpua", "Harry Hood", "He Ent to the Bog", "Heartache", "Heavy Things", "Horn", "The Horse", "I Am Hydrogen", "I Been Around", "I Didn't Know", "Icculus", "Idea", "If I Could", "If I Told You", "In a Hole", "In a Misty Glade", "Ingest", "The Inlaw Josie Wales", "Insects", "Invisible", "It's Ice", "Jaegermeister Song", "Jennifer Dances", "Joy", "Julius", "Keyboard Army", "Kill Devil Falls", "Kung", "The Landlady", "Last Victor Jam", "Lawn Boy", "Lazy and Red", "Lengthwise", "Leprechaun", "Let Me Lie", "Letter to Jimmy Page", "Lifeboy", "Light", "Limb By Limb", "Liquid Time", "The Lizards", "Llama", "Lushington", "Maggie's Revenge", "Magilla", "Makisupa Policeman", "The Man Who Stepped Into Yesterday", "The Mango Song", "Maze", "McGrupp and the Watchful Hosemasters", "Meat", "Meatstick", "Mexican Cousin", "Mike's Song", "Minkin", "Mock Song", "The Moma Dance", "Montana", "Mound", "Mountains in the Mist", "Mozambique", "Mr. Completely", "My Friend, My Friend", "My Left Toe", "My Problem Right There", "My Sweet One", "N02", "The Name Is Slick", "Never", "NICU", "No Dogs Allowed", "Nothing", "Ocelot", "The Oh Kee Pa Ceremony", "Only a Dream", "Party Time", "Pebbles And Marbles", "Pigtail", "Piper", "Poor Heart", "Possum", "The Practical Song", "Prep School Hippie", "Prince Caspian", "Punch Me in the Eye", "Punch You in the Eye", "Quadrophonic Toppling", "Reba", "Revolution", "Rift", "Riker's Mailbox", "Rocka William", "Roggae", "Round Room", "Run Like An Antelope", "Runaway Jim", "Running Scared", "Sample in a Jar", "Sand", "Sanity", "Saw it Again", "Scent of a Mule", "Scents and Subtle Sounds", "Secret Smile", "Setting Sail", "Seven Below", "Shafty", "Show of Life", "Shrine", "Silent in the Morning", "Simple", "Skippy the Wondermouse", "Sky Train Wand", "Slave to the Traffic Light", "Sleep", "Sleep Again", "Sleeping Monkey", "The Sloth", "Somantin", "Sparkle", "Spices", "Splinters of Hail", "Split Open and Melt", "Spock's Brain", "Spread it Round", "The Squirming Coil", "Stash", "Stealing Time From The Faulty Plan", "Steam", "Steep", "Strange Design", "Sugar Shack", "Summer of '89", "Susskind Hotel", "Suzy Greenberg", "Swept Away", "Talk", "Taste", "Tela", "Theme From the Bottom", "Thunderhead", "Time Turns Elastic", "Tiny", "Title Track", "Tomorrow's Song", "Train Song", "Tube", "Tweezer", "Tweezer Reprise", "Twenty Years Later", "Twist", "Two Versions of Me", "Undermind", "Union Federal", "Victor Jam Session", "Vultures", "Waking Up", "Walfredo", "Walls Of The Cave", "Waste", "Water in the Sky", "Waves", "The Wedge", "Weekapaug Groove", "Weekly Time", "Weigh", "What Things Seem", "What's the Use?", "Wilson", "Windora Bug", "Windy City", "Wolfman's Brother", "Wombat", "You Enjoy Myself"]
+      song: ["A Song I Heard the Ocean Sing", "AC/DC Bag", "Access Me", "Acoustic Army", "Aftermath", "Albert", "All of These Dreams", "All Things Reconsidered", "Alumni Blues", "Ambient Jam", "Amidst the Peals of Laughter", "Anarchy", "And It Stoned Me", "And So To Bed", "Another One Bites the Dust", "Antelope", "Anything But Me", "Army of One", "Art Jam", "ASIHTOS", "Ass Handed", "ATR", "Axilla", "Axilla (Part II)", "Band/Crew Football Theme Song", "Bathtub Gin", "BBFCFM", "Beauty of a Broken Heart", "Big Ball Jam", "Big Black Furry Creature from Mars", "Billy Breathes", "Birds of a Feather", "Bittersweet Motel", "Black-Eyed Katy", "Blaze On", "Bliss", "BOTT", "Bouncing Around the Room", "Breath and Burning", "Brian and Robert", "Brother", "Buffalo Bill", "Bundle of Joy", "Buried Alive", "Bye Bye Foot", "Camel Walk", "Can't Always Listen", "Carini", "Carolina in the Morning", "Cars Trucks Buses", "Catapult", "Cavern", "Chalk Dust Torture", "Chalk Dust Torture Reprise", "Character Zero", "Clod", "Colonel Forbin's Ascent", "Contact", "Cool Amber and Mercury", "Costume Contest", "Couch Lady", "Crowd Control", "Dave's Energy Guide", "David Bowie", "Dear Mrs. Reagan", "Death Don't Hurt Very Long", "Demand", "Destiny Unbound", "Devotion To a Dream", "Digital Delay Loop Jam", "Dinner and a Movie", "Divided Sky", "Dog Faced Boy", "Dog Gone Dog", "Dog Log", "Dogs Stole Things", "Don't Get Me Wrong", "Doomsday", "Down with Disease", "Dr. Gabel", "Drive-In Jam", "Driver", "Eliza", "End of Session", "Esther", "Everything is Hollow", "Faht", "Farmhouse", "Fast Enough for You", "Fee", "Fikus", "Fire Up the Ganja", "Fish Bass", "Fishman's Gull Poem", "Flat Fee", "Flatbed Truck Jam", "Flip", "Fluff's Travels", "Fluffhead", "Fly Famous Mockingbird", "Foam", "Fooled by Images", "Frankie Says", "Free", "Freeworld", "Friday", "Friends", "Fuck Your Face", "Fuckerpants", "Fuego", "Gatekeeper", "Gaul Swerves and the Rest is Everything Else", "Get Back on the Train", "Ghost", "Glide", "Glide II", "Golgi Apparatus", "Grind", "Guelah Papyrus", "Gumbo", "Guy Forget", "Guyute", "Ha Ha Ha", "Halfway to the Moon", "Hall in Solace", "Halley's Comet", "Harpua", "Harry Hood", "He Ent to the Bog", "Hell's Bells", "Home", "Horn", "I Always Wanted It This Way", "I Am Hydrogen", "I Been Around", "I Didn't Know", "I Don't Care", "I Will Set You Free", "I've Turned Bad", "Icculus", "Idea", "If I Could", "In a Hole", "In a Misty Glade", "In an Intensive Care Unit", "In The Good Old Summer Time", "Infinite", "Ingest", "Insects", "Intro", "It's Ice", "Jägermeister Song", "Jennifer Dances", "Join the Band", "Joy", "Julius", "Keepin' It Real", "Keyboard Army", "Keyboard Cavalry", "Kill Devil Falls", "Killer Joe", "Kung", "Lawn Boy", "Lawn Boy Reprise", "Leaves", "Lengthwise", "Leprechaun", "Let's Go", "Letter to Jimmy Page", "Lifeboy", "Limb By Limb", "Llama", "Love Is What We Are", "Lucy Had A Lumpy Head", "Lushington", "Maggie's Revenge", "Magilla", "Makisupa Policeman", "Mallory", "Marijuana Hot Chocolate", "Martian Monster", "Maze", "McGrupp and the Watchful Hosemasters", "Meat", "Meatstick", "Melt", "Mercury", "Merry Pranksters Jam", "Metal Bagel Death", "Mexican Cousin", "Mike's Song", "Minkin", "Miss You", "MMGAMOIO", "MmmBop", "Mock Song", "Montana", "More", "Mound", "My Friend, My Friend", "My Left Toe", "My Problem Right There", "My Sweet One", "N2O", "Never", "NICU", "No Dogs Allowed", "No Men In No Man's Land", "NO2", "Norwegian Wood (This Bird Has Flown)", "Nowhere Fast", "Oblivious Fool", "Ocelot", "Olivia's Pool", "Party Time", "Passing Through", "Piano Duet", "Pigtail", "Piper", "Play by Play", "Poor Heart", "Possum", "Prep School Hippie", "Prince Caspian", "Punch Me in the Eye", "Punch You in the Eye", "PYITE", "Quadrophonic Toppling", "Reba", "Revolution", "Rhombus Narration", "Rift", "Riker's Mailbox", "Rock A William", "Rocketsled's Funky Main Man Meets Big Joe on Church Street", "Roggae", "Roll Like a Cantaloupe", "Rotation Jam", "Round Room", "Run Like an Antelope", "Runaway Jim", "Running Out of Time", "Sample in a Jar", "Sanity", "Say it to Me S.A.N.T.O.S.", "Say Something", "Scent of a Mule", "Scents and Subtle Sounds", "Secret Language Instructions", "Setting Sail", "Seven Below", "Shade", "Shafty", "Shipwreck", "Silent in the Morning", "Simple", "Sing Monica", "Skippy the Wondermouse", "Slave to the Traffic Light", "Sleep", "Sleeping Monkey", "Sleepwalk", "Snow", "SOAM", "Sparkle", "Split Open and Melt", "Spock's Brain", "Spread It 'Round", "Stash", "Stealing Time From the Faulty Plan", "Steam", "Steep", "Storage Jam", "Strange Design", "Stray Dog", "Sugar Shack", "Summer of '89", "Sunshine of Your Feeling", "Suzy Greenberg", "Swept Away", "T.V. Theme", "Talk", "Taste", "Taste That Surrounds", "Tela", "The Asse Festival", "The Birds", "The Birdwatcher", "The Chase", "The Chinese Water Torture", "The Connection", "The Curtain", "The Curtain With", "The Dickie Scotland Song", "The Divided Sky", "The Dogs", "The Final Hurrah", "The Fog That Surrounds", "The Happy Whip and Dung Song", "The Haunted House", "The Horse", "The Landlady", "The Line", "The Lizards", "The Man Who Stepped Into Yesterday", "The Mango Song", "The Moma Dance", "The Name is Slick", "The Oh Kee Pa Ceremony", "The Practical Song", "The Sloth", "The Squirming Coil", "The Unsafe Bridge", "The Very Long Fuse", "The Vibration of Life", "The Wedge", "Theme From the Bottom", "Things People Do", "Thread", "Tide Turns", "Timber", "Tiny", "Title Track", "TMWSIY", "Tomorrow's Song", "Tower Jam", "Train Song", "Tropical Hot Dog Night", "Trust Fund Baby", "TTE", "Tube", "Turtle in the Clouds", "Tweezer", "Tweezer Reprise", "Twenty Years Later", "Twist", "Two Versions of Me", "Union Federal", "Vacuum Solo", "Vultures", "Wading in the Velvet Sea", "Wait", "Waiting All Night", "Waking Up", "Waking Up Dead", "Walfredo", "Walls of the Cave", "Waste", "Water in the Sky", "Waves", "We Are Come to Outlive Our Brains", "Weekapaug Groove", "Weekly Time", "Weigh", "What Things Seem", "What You Will", "What's the Use?", "Who Do? We Do!", "Wilson", "Windham Hell", "Windy City", "Wingsuit", "Wolfman's Brother", "Wombat", "Yarmouth Road", "YEM", "You Enjoy Myself", "You Never Know", "Your Pet Cat"]
diff --git a/faker/lib/locales/en/rupaul.yml b/faker/lib/locales/en/rupaul.yml
--- a/faker/lib/locales/en/rupaul.yml
+++ b/faker/lib/locales/en/rupaul.yml
@@ -68,28 +68,58 @@
         "Valentina",
         "Farrah Moan",
         "Aja",
-        "Cynthia Lee Fontaine"
+        "Cynthia Lee Fontaine",
+        "Aquaria",
+        "Eureka",
+        "Kameron Michaels",
+        "Asia O'Hara",
+        "Miz Cracker",
+        "Monet X Change",
+        "The Vixen",
+        "Monique Heart",
+        "Blair St. Clair",
+        "Mayhem Miller",
+        "A'keria Chanel Davenport",
+        "Ariel Versace",
+        "Brook Lynn Hytes",
+        "Mercedes Iman Diamond",
+        "Nina West",
+        "Plastique Tiara",
+        "Ra'jah O'Hara",
+        "Scarlet Envy",
+        "Shuga Cain",
+        "Silky Nutmeg Ganache",
+        "Vanessa Vanjie Mateo",
+        "Yvie Oddly"
       ]
       quotes: [
        "Glamazon!",
-       "Put The Bass In Your Walk",
-       "Sashay Away",
-       "Don't F*ck It Up",
-       "Shante, You Stay",
-       "Shante, Shante, Shante",
-       "You Betta Work",
-       "Lip-Sync for Your Life",
-       "Extravaganza Eleganza",
-       "Let the music play",
-       "That's Funny, Tell Another One",
-       "Sissy That Walk",
-       "Don't Be Jealous Of My Boogie",
-       "You're Born Naked, The Rest Is Drag",
-       "Life Is About Using The Whole Box Of Crayons",
-       "When The Going Gets Tough, The Tough Reinvent",
-       "Hello Hello Hello!",
-       "Bring Back My Girls",
-       "Just Between Us Squirrel Friends",
-       "Get Out Your Library Cards",
-       "Silence...I've made my decision",
+       "Put the bass in your walk.",
+       "Sashay away.",
+       "Good luck, and don't fuck it up.",
+       "Shante, you stay.",
+       "You betta work.",
+       "The time has come, for you to lip-sync for your life!",
+       "Extravaganza eleganza!",
+       "Now, let the music play!",
+       "That's funny, tell another one.",
+       "Sissy that walk.",
+       "Don't be jealous of my boogie.",
+       "We're all born naked and the rest is drag.",
+       "Life is about using the whole box of crayons.",
+       "When the going gets tough, the tough reinvent themselves.",
+       "Hello, hello, hello!",
+       "Bring back my girls.",
+       "Just between us squirrel friends...",
+       "In the great tradition of Paris is Burning, \"Get out your Library Cards!\"",
+       "Because reading is what?",
+       "Now listen, I gotta tell ya...",
+       "Silence...I've made my decision.",
+       "You're a winner, baby!",
+       "Condragulations!",
+       "I'm sorry, my dear, but you are up for elimination.",
+       "Prance, I say!",
+       "If you can't love yourself, how in the hell you gonna love somebody else?",
+       "Must be jelly 'cause jam don't shake.",
+       "She done already done had herses."
       ]
diff --git a/faker/lib/locales/en/super_smash_bros.yml b/faker/lib/locales/en/super_smash_bros.yml
--- a/faker/lib/locales/en/super_smash_bros.yml
+++ b/faker/lib/locales/en/super_smash_bros.yml
@@ -24,10 +24,13 @@
           - Greninja
           - Ice Climbers
           - Ike
+          - Incineroar
           - Inkling
           - Isabelle
           - Ivysaur
           - Jigglypuff
+          - Joker
+          - Ken
           - King Dedede
           - King K. Rool
           - Kirby
@@ -53,6 +56,7 @@
           - Peach
           - Pichu
           - Pikachu
+          - Piranha Plant
           - Pit
           - Pokémon Trainer
           - R.O.B.
diff --git a/faker/lib/locales/fr-CA.yml b/faker/lib/locales/fr-CA.yml
--- a/faker/lib/locales/fr-CA.yml
+++ b/faker/lib/locales/fr-CA.yml
@@ -4,7 +4,6 @@
       postcode: /[A-CEJ-NPR-TVXY][0-9][A-CEJ-NPR-TV-Z] ?[0-9][A-CEJ-NPR-TV-Z][0-9]/
       state: [Alberta, British Columbia, Manitoba, New Brunswick, Newfoundland and Labrador, Nova Scotia, Northwest Territories, Nunavut, Ontario, Prince Edward Island, Quebec, Saskatchewan, Yukon]
       state_abbr: ["AB", "BC", "MB", "NB", "NL", "NS", "NU", "NT", "ON", "PE", "QC", "SK", "YT"]
-      default_country: [Canada]
       country_code: ['CA']
       building_number: ['####', '###', '##', '#']
       street_prefix: ["Allée, Voie", "Rue", "Avenue", "Boulevard", "Quai", "Passage", "Impasse", "Place"]
@@ -58,10 +57,6 @@
       name:
         - "#{Name.last_name} #{suffix}"
         - "#{Name.last_name} et #{Name.last_name}"
-
-    internet:
-      free_email: [gmail.com, yahoo.fr, hotmail.fr]
-      domain_suffix: [com, fr, eu, info, name, net, org, immo, paris, alsace, bzh]
 
     lorem:
       words: [alias, consequatur, aut, perferendis, sit, voluptatem, accusantium, doloremque, aperiam, eaque, ipsa, quae, ab, illo, inventore, veritatis, et, quasi, architecto, beatae, vitae, dicta, sunt, explicabo, aspernatur, aut, odit, aut, fugit, sed, quia, consequuntur, magni, dolores, eos, qui, ratione, voluptatem, sequi, nesciunt, neque, dolorem, ipsum, quia, dolor, sit, amet, consectetur, adipisci, velit, sed, quia, non, numquam, eius, modi, tempora, incidunt, ut, labore, et, dolore, magnam, aliquam, quaerat, voluptatem, ut, enim, ad, minima, veniam, quis, nostrum, exercitationem, ullam, corporis, nemo, enim, ipsam, voluptatem, quia, voluptas, sit, suscipit, laboriosam, nisi, ut, aliquid, ex, ea, commodi, consequatur, quis, autem, vel, eum, iure, reprehenderit, qui, in, ea, voluptate, velit, esse, quam, nihil, molestiae, et, iusto, odio, dignissimos, ducimus, qui, blanditiis, praesentium, laudantium, totam, rem, voluptatum, deleniti, atque, corrupti, quos, dolores, et, quas, molestias, excepturi, sint, occaecati, cupiditate, non, provident, sed, ut, perspiciatis, unde, omnis, iste, natus, error, similique, sunt, in, culpa, qui, officia, deserunt, mollitia, animi, id, est, laborum, et, dolorum, fuga, et, harum, quidem, rerum, facilis, est, et, expedita, distinctio, nam, libero, tempore, cum, soluta, nobis, est, eligendi, optio, cumque, nihil, impedit, quo, porro, quisquam, est, qui, minus, id, quod, maxime, placeat, facere, possimus, omnis, voluptas, assumenda, est, omnis, dolor, repellendus, temporibus, autem, quibusdam, et, aut, consequatur, vel, illum, qui, dolorem, eum, fugiat, quo, voluptas, nulla, pariatur, at, vero, eos, et, accusamus, officiis, debitis, aut, rerum, necessitatibus, saepe, eveniet, ut, et, voluptates, repudiandae, sint, et, molestiae, non, recusandae, itaque, earum, rerum, hic, tenetur, a, sapiente, delectus, ut, aut, reiciendis, voluptatibus, maiores, doloribus, asperiores, repellat]
diff --git a/faker/lib/locales/fr-CH.yml b/faker/lib/locales/fr-CH.yml
--- a/faker/lib/locales/fr-CH.yml
+++ b/faker/lib/locales/fr-CH.yml
@@ -3,7 +3,6 @@
     address:
       country_code: [CH, CH, CH, DE, AT, US, LI, US, HK, VN]
       postcode: ['1###', '2###', '3###', '4###', '5###', '6###', '7###', '8###', '9###']
-      default_country: [Suisse]
       building_number: ['####', '###', '##', '#']
       street_prefix: ["Allée, Voie", "Rue", "Avenue", "Boulevard", "Quai", "Passage", "Impasse", "Place"]
       secondary_address: ['Apt. ###', '# étage']
diff --git a/faker/lib/locales/fr.yml b/faker/lib/locales/fr.yml
--- a/faker/lib/locales/fr.yml
+++ b/faker/lib/locales/fr.yml
@@ -80,7 +80,7 @@
 
     name:
       first_name: [Enzo, Lucas, Mathis, Nathan, Thomas, Hugo, Théo, Tom, Louis, Raphaël, Clément, Léo, Mathéo, Maxime, Alexandre, Antoine, Yanis, Paul, Baptiste, Alexis, Gabriel, Arthur, Jules, Ethan, Noah, Quentin, Axel, Evan, Mattéo, Romain, Valentin, Maxence, Noa, Adam, Nicolas, Julien, Mael, Pierre, Rayan, Victor, Mohamed, Adrien, Kylian, Sacha, Benjamin, Léa, Clara, Manon, Chloé, Camille, Ines, Sarah, Jade, Lola, Anaïs, Lucie, Océane, Lilou, Marie, Eva, Romane, Lisa, Zoe, Julie, Mathilde, Louise, Juliette, Clémence, Célia, Laura, Lena, Maëlys, Charlotte, Ambre, Maeva, Pauline, Lina, Jeanne, Lou, Noémie, Justine, Louna, Elisa, Alice, Emilie, Carla, Maëlle, Alicia, Mélissa]
-      last_name: [Martin, Bérnard, Dubois, Thomas, Robért, Richard, Pétit, Durand, Léroy, Moréau, Simon, Laurént, Lefévre, Michél, Garcia, David, Bértrand, Roux, Vincent, Fourniér, Morél, Girard, André, Lévêque , Merciér, Dupont, Lambért, Bonnét, Francois, Martinéz, Légrand, Garniér, Fauré, Rousséau, Blanc, Guérin, Mullér, Hénry, Roussél, Nicolas, Pérrin, Morin, Mathiéu, Clemént, Gauthiér, Dumont, Lopéz, Fontainé, Chevaliér, Robin, Masson, Sanchéz, Gérard, Nguyén, Boyér, Dvnis, Lemairé, Duval, Joly, Gautiér, Rogér,Roché, Roy, Noél, Meyér, Lucas, Méunier,Jéan, Peréz, Marchand, Dufour, Blanchard, Marié, Barbiér, Brun, Dumas, Brunét, Schmitt, Leroux, Colin, Fernandéz, Piérre, Rénard, Arnaud, Rolland, Caron, Aubért, Giraud, Leclérc, Vidal, Bourgéois, Renaud, Lemoiné, Picard, Gaillard, Philippé, Leclércq, Lacroix, Fabré, Dupuis, Oliviér, Rodriguéz, Da silva, Hubért, Louis, Charlés, Guillot, Rivieré, Le gall, Guillaume, Adam, Rey, Moulin, Gonzaléz, Bergér, Lecomté, Ménard, Fléury, Déschamps, Carpéntier, Julién, Bénoit, Paris, Maillard, Marchal, Aubry, Vasséur, Le roux, Rénault, Jacquét, Collét, Prévost, Poiriér, Charpéntier, Royér, Huét, Baron, Dupuy, Pons, Paul, Lainé, Carré, Bréton, Rémy, Schneidér, Pérrot, Guyot,Barré, Marty, Cousin]
+      last_name: [Martin, Bernard, Dubois, Thomas, Robert, Richard, Petit, Durand, Leroy, Moreau, Simon, Laurent, Lefèvre, Michel, Garcia, David, Bertrand, Roux, Vincent, Fournier, Morel, Girard, André, Lévêque, Mercier, Dupont, Lambert, Bonnet, Francois, Martinez, Legrand, Garnier, Faure, Rousseau, Blanc, Guérin, Muller, Henry, Roussel, Nicolas, Perrin, Morin, Mathieu, Clément, Gauthier, Dumont, Lopéz, Fontaine, Chevalier, Robin, Masson, Sanchez, Gérard, Nguyen, Boyer, Dvnis, Lemaire, Duval, Joly, Gautier, Roger, Roche, Roy, Noël, Meyer, Lucas, Méunier, Jean, Perez, Marchand, Dufour, Blanchard, Marie, Barbier, Brun, Dumas, Brunet, Schmitt, Leroux, Colin, Fernandez, Pierre, Renard, Arnaud, Rolland, Caron, Aubert, Giraud, Leclerc, Vidal, Bourgeois, Renaud, Lemoine, Picard, Gaillard, Philippe, Leclercq, Lacroix, Fabre, Dupuis, Olivier, Rodriguez, Da silva, Hubert, Louis, Charles, Guillot, Rivière, Le gall, Guillaume, Adam, Rey, Moulin, Gonzalez, Berger, Lecomte, Ménard, Fleury, Deschamps, Carpentier, Julien, Benoit, Paris, Maillard, Marchal, Aubry, Vasseur, Le roux, Renault, Jacquet, Collet, Prévost, Poirier, Charpentier, Royer, Huet, Baron, Dupuy, Pons, Paul, Laine, Carre, Breton, Rémy, Schneider, Perrot, Guyot, Barre, Marty, Cousin]
       prefix: [M, Mme, Mlle, Dr, Prof]
       title:
         job: [Superviseur, Executif, Manager, Ingenieur, Specialiste, Directeur, Coordinateur, Administrateur, Architecte, Analyste, Designer, Technicien, Developpeur, Producteur, Consultant, Assistant, Agent, Stagiaire]
diff --git a/faker/lib/locales/ja.yml b/faker/lib/locales/ja.yml
--- a/faker/lib/locales/ja.yml
+++ b/faker/lib/locales/ja.yml
@@ -16,12 +16,18 @@
         - "#{Name.last_name}#{street_suffix}"
       default_country: [日本]
 
+    ancient:
+      god: ["アフロディテ", "アポロン", "アレス", "アルテミス", "アテナ", "デメテル", "ディオニュソス", "ハデス", "ヘパイストス", "ヘラ", "ヘルメス", "ヘスティア", "ポセイドン", "ゼウス"]
+
     cat:
       breed: ["アジアンセミロングヘア", "アビシニアン", "アメリカンカール", "アメリカンショートヘア", "アメリカンボブテイル", "アメリカンワイヤーヘア", "アラビアンマウ", "イジアン", "エキゾチックショートヘア", "エキゾチックフォールド", "エジプシャンマウ", "オーストラリアンミスト", "オシキャット", "オリエンタルショートヘア", "カオマニー", "キムリック", "キンカロー", "コーニッシュレックス", "コラット", "サイベリアン", "ジャパニーズボブテイル", "シャム", "シャルトリュー", "シンガプーラ", "ラパーマ", "リュコイ", "ジャーマンレックス", "ハバマブラウン", "ハイランダーリンクス", "スコティッシュフォールド", "スノーシュー", "スフィンクス", "セルカークレックス", "ソマリ", "クリルアイランドボブテイル", "ターキッシュアンゴラ", "ターキッシュバン", "チャウシー", "チートー", "カラーポイントショートヘア", "コーニッシュレックス", "デボンレックス", "ドンスコイ", "ドラゴンリー", "ヨーロピアンショートヘア", "デボンレックス", "トンキニーズ", "ノルウェージャンフォレストキャット", "バーマン", "バーミーズ", "バーミラ", "バリニーズ", "シャンティリー", "バンビーノ", "ヒマラヤン", "メコンボブテイル", "ミンスキン", "ブラジリアンショートヘア", "ブリティッシュロングヘア", "ブリティッシュショートヘア", "カリフォルニアスパングルド", "ペルシャ", "ベンガル", "ボンベイ", "マンクス", "マンチカン", "ミヌエット", "メインクーン", "ヨーロピアンバーミーズ", "ラガマフィン", "ラグドール", "ラパーマ", "ラムキン", "ロシアンブルー"]
 
     cell_phone:
       formats: ['090-####-####', '080-####-####', '070-####-####']
 
+    coffee:
+      country: ["イエメン", "インド", "ウガンダ", "エチオピア", "エルサルバドル", "グアテマラ", "ケニア", "コスタリカ", "コロンビア", "スマトラ", "タンザニア", "ニカラグア", "パナマ", "ブラジル", "ブルンジ", "ホンジュラス", "メキシコ", "ルワンダ"]
+
     color:
       name: ["赤", "緑", "青", "黄", "紫", "ミントグリーン", "ティール", "白", "黒", "オレンジ", "ピンク", "灰色", "栗色", "バイオレット", "ターコイズブルー", "タン", "空色", "サーモン", "プラム", "オーキッド", "オリーブ", "マゼンタ", "ライム", "アイボリー", "藍色", "金", "フクシア", "シアン", "紺碧", "ラベンダー", "銀"]
 
@@ -68,6 +74,16 @@
 
     phone_number:
       formats: ['0####-#-####', '0###-##-####', '0##-###-####', '0#-####-####']
+
+    restaurant:
+      name_prefix: ["ビッグ", "ゴールデン", "ハングリー", "シルバー", "レッド", "ブルー", "グリーン", "オレンジ", "イエロー"]
+      name_suffix: ["ベーカリー", "バー", "焼肉", "ブラッスリー", "バーガー", "カフェ", "コーヒー", "ピッツア", "鉄板焼き", "鮨", "ラーメン", "居酒屋"]
+      name:
+        - "#{name_suffix} #{Name.last_name}"
+        - "#{name_suffix} #{name_prefix}#{Name.last_name}"
+        - "#{name_suffix} #{name_prefix}"
+        - "#{type} #{Name.last_name}"
+      type: ["懐石", "割烹", "精進料理", "京料理", "寿司", "ふぐ", "かに", "すっぽん", "あんこう", "天ぷら", "とんかつ", "串揚げ", "からあげ", "そば", "うどん", "うなぎ", "焼鳥", "すき焼き", "しゃぶしゃぶ", "おでん", "お好み焼き", "もんじゃ焼き", "たこ焼き", "牛丼", "ステーキ", "ハンバーグ", "鉄板焼き", "パスタ", "ピザ", "ハンバーガー", "洋食", "フレンチ", "ビストロ", "イタリアン", "中華料理", "韓国料理", "タイ料理", "メキシコ料理", "カレー", "焼肉", "居酒屋", "ダイニングバー", "ファミレス", "ラーメン", "カフェ", "喫茶店", "パン", "洋菓子", "和菓子", "バー"]
 
     space:
       planet: ["水星", "金星", "地球", "火星", "木星", "土星", "天王星", "海王星"]
diff --git a/faker/lib/locales/zh-CN.yml b/faker/lib/locales/zh-CN.yml
--- a/faker/lib/locales/zh-CN.yml
+++ b/faker/lib/locales/zh-CN.yml
@@ -2,15 +2,12 @@
 zh-CN:
   faker:
     address:
-      city_prefix: [长, 上, 南, 西, 北, 诸, 宁, 珠, 武, 衡, 成, 福, 厦, 贵, 吉, 海, 太, 济, 安, 吉, 包]
-      city_suffix: [沙市, 京市, 宁市, 安市, 乡县, 海市, 码市, 汉市, 阳市, 都市, 州市, 门市, 阳市, 口市, 原市, 南市, 徽市, 林市, 头市]
+      city: [海门, 鄂尔多斯, 招远, 舟山, 齐齐哈尔, 盐城, 赤峰, 青岛, 乳山, 金昌, 泉州, 莱西, 日照, 胶南, 南通, 拉萨, 云浮, 梅州, 文登, 上海, 攀枝花, 威海, 承德, 厦门, 汕尾, 潮州, 丹东, 太仓, 曲靖, 烟台, 福州, 瓦房店, 即墨, 抚顺, 玉溪, 张家口, 阳泉, 莱州, 湖州, 汕头, 昆山, 宁波, 湛江, 揭阳, 荣成, 连云港, 葫芦岛, 常熟, 东莞, 河源, 淮安, 泰州, 南宁, 营口, 惠州, 江阴, 蓬莱, 韶关, 嘉峪关, 广州, 延安, 太原, 清远, 中山, 昆明, 寿光, 盘锦, 长治, 深圳, 珠海, 宿迁, 咸阳, 铜川, 平度, 佛山, 海口, 江门, 章丘, 肇庆, 大连, 临汾, 吴江, 石嘴山, 沈阳, 苏州, 茂名, 嘉兴, 长春, 胶州, 银川, 张家港, 三门峡, 锦州, 南昌, 柳州, 三亚, 自贡, 吉林, 阳江, 泸州, 西宁, 宜宾, 呼和浩特, 成都, 大同, 镇江, 桂林, 张家界, 宜兴, 北海, 西安, 金坛, 东营, 牡丹江, 遵义, 绍兴, 扬州, 常州, 潍坊, 重庆, 台州, 南京, 滨州, 贵阳, 无锡, 本溪, 克拉玛依, 渭南, 马鞍山, 宝鸡, 焦作, 句容, 北京, 徐州, 衡水, 包头, 绵阳, 乌鲁木齐, 枣庄, 杭州, 淄博, 鞍山, 溧阳, 库尔勒, 安阳, 开封, 济南, 德阳, 温州, 九江, 邯郸, 临安, 兰州, 沧州, 临沂, 南充, 天津, 富阳, 泰安, 诸暨, 郑州, 哈尔滨, 聊城, 芜湖, 唐山, 平顶山, 邢台, 德州, 济宁, 荆州, 宜昌, 义乌, 丽水, 洛阳, 秦皇岛, 株洲, 石家庄, 莱芜, 常德, 保定, 湘潭, 金华, 岳阳, 长沙, 衢州, 廊坊, 菏泽, 合肥, 武汉, 大庆]
       building_number: ['#####', '####', '###', '##', '#']
       street_suffix: [巷, 街, 路, 桥, 侬, 旁, 中心, 栋]
       postcode: ['######']
       state: [北京市, 上海市, 天津市, 重庆市, 黑龙江省, 吉林省, 辽宁省, 内蒙古, 河北省, 新疆, 甘肃省, 青海省, 陕西省, 宁夏, 河南省, 山东省, 山西省, 安徽省, 湖北省, 湖南省, 江苏省, 四川省, 贵州省, 云南省, 广西省, 西藏, 浙江省, 江西省, 广东省, 福建省, 海南省, 香港, 澳门]
       state_abbr: [京, 沪, 津, 渝, 黑, 吉, 辽, 蒙, 冀, 新, 甘, 青, 陕, 宁, 豫, 鲁, 晋, 皖, 鄂, 湘, 苏, 川, 黔, 滇, 桂, 藏, 浙, 赣, 粤, 闽, 琼, 港, 澳]
-      city:
-        - "#{city_prefix}#{city_suffix}"
       street_name:
         - "#{Name.last_name}#{street_suffix}"
       street_address:
@@ -23,8 +20,8 @@
       first_name: [绍齐, 博文, 梓晨, 胤祥, 瑞霖, 明哲, 天翊, 凯瑞, 健雄, 耀杰, 潇然, 子涵, 越彬, 钰轩, 智辉, 致远, 俊驰, 雨泽, 烨磊, 晟睿, 文昊, 修洁, 黎昕, 远航, 旭尧, 鸿涛, 伟祺, 荣轩, 越泽, 浩宇, 瑾瑜, 皓轩, 擎苍, 擎宇, 志泽, 子轩, 睿渊, 弘文, 哲瀚, 雨泽, 楷瑞, 建辉, 晋鹏, 天磊, 绍辉, 泽洋, 鑫磊, 鹏煊, 昊强, 伟宸, 博超, 君浩, 子骞, 鹏涛, 炎彬, 鹤轩, 越彬, 风华, 靖琪, 明辉, 伟诚, 明轩, 健柏, 修杰, 志泽, 弘文, 峻熙, 嘉懿, 煜城, 懿轩, 烨伟, 苑博, 伟泽, 熠彤, 鸿煊, 博涛, 烨霖, 烨华, 煜祺, 智宸, 正豪, 昊然, 明杰, 立诚, 立轩, 立辉, 峻熙, 弘文, 熠彤, 鸿煊, 烨霖, 哲瀚, 鑫鹏, 昊天, 思聪, 展鹏, 笑愚, 志强, 炫明, 雪松, 思源, 智渊, 思淼, 晓啸, 天宇, 浩然, 文轩, 鹭洋, 振家, 乐驹, 晓博, 文博, 昊焱, 立果, 金鑫, 锦程, 嘉熙, 鹏飞, 子默, 思远, 浩轩, 语堂, 聪健, 明, 文, 果, 思, 鹏, 驰, 涛, 琪, 浩, 航, 彬]
       name:
         - "#{last_name}#{first_name}"
-      name_with_middle:
-        - "#{first_name} #{last_name} #{last_name}"
+      name_with_middle: # Chinese names don't have middle names
+        - "#{name}"
 
     phone_number:
       formats: ['###-########', '####-########', '###########']
diff --git a/faker/lib/locales/zh-TW.yml b/faker/lib/locales/zh-TW.yml
--- a/faker/lib/locales/zh-TW.yml
+++ b/faker/lib/locales/zh-TW.yml
@@ -22,8 +22,8 @@
       first_name: [怡君, 欣怡, 雅雯, 心怡, 志豪, 雅婷, 雅惠, 家豪, 雅玲, 靜怡, 志偉, 俊宏, 建宏, 佩君, 怡婷, 淑芬, 靜宜, 俊傑, 怡如, 家銘, 佳玲, 慧君, 怡伶, 雅芳, 宗翰, 志宏, 淑娟, 信宏, 志強, 淑婷, 佩珊, 佳慧, 佳蓉, 佳穎, 淑惠, 智偉, 欣儀, 嘉玲, 雅慧, 惠雯, 玉婷, 惠如, 惠君, 宜芳, 惠婷, 淑華, 志明, 雅芬, 家榮, 俊賢, 俊豪, 慧玲, 嘉宏, 佩芬, 佳樺, 雅琪, 淑萍, 淑君, 婉婷, 佳琪, 韻如, 詩婷, 建良, 芳儀, 宜君, 佩蓉, 志銘, 雅鈴, 建文, 佩玲, 鈺婷, 雅萍, 立偉, 文傑, 慧如, 淑慧, 佳宏, 志遠, 靜儀, 惠玲, 淑玲, 美君, 怡慧, 千慧, 馨儀, 嘉慧, 家瑋, 美慧, 美玲, 建志, 宗憲, 筱婷, 靜雯, 雅君, 彥廷, 怡靜, 玉玲, 郁婷, 俊男]
       name:
         - "#{last_name}#{first_name}"
-      name_with_middle:
-        - "#{first_name} #{last_name} #{last_name}"
+      name_with_middle: # Chinese names don't have middle names or spaces
+        - "#{name}"
 
     phone_number:
       formats: ['###-########', '####-########', '###########']
diff --git a/src/Config.hs b/src/Config.hs
--- a/src/Config.hs
+++ b/src/Config.hs
@@ -194,6 +194,7 @@
   | WorldOfWarcraft
   | Yoda
   | Zelda
+  | Opera
   | CustomSourceEnglish String
 
 sourceFile :: SourceData -> FilePath
@@ -342,6 +343,7 @@
 sourceFile Yoda = "yoda"
 sourceFile Zelda = "zelda"
 sourceFile Basketball = "basketball"
+sourceFile Opera = "opera"
 
 mapSource :: Text -> Name
 mapSource "horse" = 'Horse
@@ -489,6 +491,7 @@
 mapSource "yoda" = 'Yoda
 mapSource "zelda" = 'Zelda
 mapSource "measurement" = 'Measurement
+mapSource "opera" = 'Opera
 mapSource item = error $ "mapSource: Invalid argument passed " <> (show item)
 
 guessSourceFile :: SourceData -> Text -> FilePath
diff --git a/src/Faker/Game/Dota.hs b/src/Faker/Game/Dota.hs
--- a/src/Faker/Game/Dota.hs
+++ b/src/Faker/Game/Dota.hs
@@ -87,3 +87,5 @@
 $(generateFakeFields "dota" ["undying", "quote"])
 
 $(generateFakeFields "dota" ["wraith_king", "quote"])
+
+$(generateFakeFields "dota" ["meepo", "quote"])
diff --git a/src/Faker/Music/Opera.hs b/src/Faker/Music/Opera.hs
new file mode 100644
--- /dev/null
+++ b/src/Faker/Music/Opera.hs
@@ -0,0 +1,17 @@
+{-# LANGUAGE TemplateHaskell #-}
+
+module Faker.Music.Opera where
+
+import Data.Text
+import Faker
+import Faker.Internal
+import Faker.Provider.Opera
+import Faker.TH
+
+$(generateFakeFields "opera" ["italian", "by_giuseppe_verdi"])
+
+$(generateFakeFields "opera" ["italian", "by_gioacchino_rossini"])
+
+$(generateFakeFields "opera" ["italian", "by_gaetano_donizetti"])
+
+$(generateFakeFields "opera" ["italian", "by_vincenzo_bellini"])
diff --git a/src/Faker/Provider/Dota.hs b/src/Faker/Provider/Dota.hs
--- a/src/Faker/Provider/Dota.hs
+++ b/src/Faker/Provider/Dota.hs
@@ -203,3 +203,7 @@
 $(genParsers "dota" ["wraith_king", "quote"])
 
 $(genProviders "dota" ["wraith_king", "quote"])
+
+$(genParsers "dota" ["meepo", "quote"])
+
+$(genProviders "dota" ["meepo", "quote"])
diff --git a/src/Faker/Provider/Opera.hs b/src/Faker/Provider/Opera.hs
new file mode 100644
--- /dev/null
+++ b/src/Faker/Provider/Opera.hs
@@ -0,0 +1,59 @@
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE TemplateHaskell #-}
+
+module Faker.Provider.Opera where
+
+import Config
+import Control.Monad.Catch
+import Data.Monoid ((<>))
+import Data.Text (Text)
+import Data.Vector (Vector)
+import Data.Yaml
+import Faker
+import Faker.Internal
+import Faker.Provider.TH
+import Language.Haskell.TH
+
+parseOpera :: FromJSON a => FakerSettings -> Value -> Parser a
+parseOpera settings (Object obj) = do
+  en <- obj .: (getLocale settings)
+  faker <- en .: "faker"
+  opera <- faker .: "opera"
+  pure opera
+parseOpera settings val = fail $ "expected Object, but got " <> (show val)
+
+parseOperaField ::
+     (FromJSON a, Monoid a) => FakerSettings -> Text -> Value -> Parser a
+parseOperaField settings txt val = do
+  opera <- parseOpera settings val
+  field <- opera .:? txt .!= mempty
+  pure field
+
+parseOperaFields ::
+     (FromJSON a, Monoid a) => FakerSettings -> [Text] -> Value -> Parser a
+parseOperaFields settings txts val = do
+  opera <- parseOpera settings val
+  helper opera txts
+  where
+    helper :: (FromJSON a) => Value -> [Text] -> Parser a
+    helper a [] = parseJSON a
+    helper (Object a) (x:xs) = do
+      field <- a .: x
+      helper field xs
+    helper a (x:xs) = fail $ "expect Object, but got " <> (show a)
+
+$(genParsers "opera" ["italian", "by_giuseppe_verdi"])
+
+$(genProviders "opera" ["italian", "by_giuseppe_verdi"])
+
+$(genParsers "opera" ["italian", "by_gioacchino_rossini"])
+
+$(genProviders "opera" ["italian", "by_gioacchino_rossini"])
+
+$(genParsers "opera" ["italian", "by_gaetano_donizetti"])
+
+$(genProviders "opera" ["italian", "by_gaetano_donizetti"])
+
+$(genParsers "opera" ["italian", "by_vincenzo_bellini"])
+
+$(genProviders "opera" ["italian", "by_vincenzo_bellini"])
diff --git a/test/GamesSpec.hs b/test/GamesSpec.hs
--- a/test/GamesSpec.hs
+++ b/test/GamesSpec.hs
@@ -38,6 +38,9 @@
     it "Dota" $ do
       item <- generate GD.hero
       item `shouldSatisfy` isText
+    it "Dota Quote" $ do
+      item <- generate GD.meepoQuote
+      item `shouldSatisfy` isText
     it "ElderScrolls" $ do
       item <- generate GE.race
       item `shouldSatisfy` isText
diff --git a/test/OperaSpec.hs b/test/OperaSpec.hs
new file mode 100644
--- /dev/null
+++ b/test/OperaSpec.hs
@@ -0,0 +1,37 @@
+{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+module OperaSpec where
+
+import Config
+import Control.Monad.Catch
+import Control.Monad.IO.Class
+import qualified Data.Map as M
+import Data.Text hiding (all, map)
+import qualified Data.Text as T
+import qualified Data.Text.IO as TIO
+import Data.Vector (Vector)
+import qualified Data.Vector as V
+import Faker
+import Faker.Music.Opera
+import Test.Hspec
+
+isText :: Text -> Bool
+isText x = T.length x >= 1
+
+spec :: Spec
+spec = do
+  describe "Faker Generate for Opera" $ do
+    it "italianByGiuseppeVerdi" $ do
+      item <- generate italianByGiuseppeVerdi
+      item `shouldSatisfy` isText
+    it "italianByGioacchinoRossini" $ do
+      item <- generate italianByGioacchinoRossini
+      item `shouldSatisfy` isText
+    it "italianByGaetanoDonizetti" $ do
+      item <- generate italianByGaetanoDonizetti
+      item `shouldSatisfy` isText
+    it "italianByVincenzoBellini" $ do
+      item <- generate italianByVincenzoBellini
+      print item
+      item `shouldSatisfy` isText
