diff --git a/custom_components/waste_collection_schedule/sources.json b/custom_components/waste_collection_schedule/sources.json
index c6d41feb..0b3c039c 100644
--- a/custom_components/waste_collection_schedule/sources.json
+++ b/custom_components/waste_collection_schedule/sources.json
@@ -15,6 +15,27 @@
       "module": "banyule_vic_gov_au",
       "default_params": {}
     },
+    {
+      "title": "Baw Baw Shire Council",
+      "module": "impactapps_com_au",
+      "default_params": {
+        "service": "Baw Baw Shire Council"
+      }
+    },
+    {
+      "title": "Bayside City Council",
+      "module": "impactapps_com_au",
+      "default_params": {
+        "service": "Bayside City Council"
+      }
+    },
+    {
+      "title": "Bega Valley Shire Council",
+      "module": "impactapps_com_au",
+      "default_params": {
+        "service": "Bega Valley Shire Council"
+      }
+    },
     {
       "title": "Belmont City Council",
       "module": "belmont_wa_gov_au",
@@ -25,11 +46,25 @@
       "module": "blacktown_nsw_gov_au",
       "default_params": {}
     },
+    {
+      "title": "Blue Mountains City Council",
+      "module": "impactapps_com_au",
+      "default_params": {
+        "service": "Blue Mountains City Council"
+      }
+    },
     {
       "title": "Brisbane City Council",
       "module": "brisbane_qld_gov_au",
       "default_params": {}
     },
+    {
+      "title": "Burwood City Council",
+      "module": "impactapps_com_au",
+      "default_params": {
+        "service": "Burwood City Council"
+      }
+    },
     {
       "title": "Campbelltown City Council (NSW)",
       "module": "campbelltown_nsw_gov_au",
@@ -50,6 +85,11 @@
       "module": "canadabay_nsw_gov_au",
       "default_params": {}
     },
+    {
+      "title": "City of Darebin",
+      "module": "darebin_vic_gov_au",
+      "default_params": {}
+    },
     {
       "title": "City of Greater Geelong",
       "module": "geelongaustralia_com_au",
@@ -65,16 +105,42 @@
       "module": "onkaparingacity_com",
       "default_params": {}
     },
+    {
+      "title": "Cowra Council",
+      "module": "impactapps_com_au",
+      "default_params": {
+        "service": "Cowra Council"
+      }
+    },
     {
       "title": "Cumberland Council (NSW)",
       "module": "cumberland_nsw_gov_au",
       "default_params": {}
     },
+    {
+      "title": "Forbes Shire Council",
+      "module": "impactapps_com_au",
+      "default_params": {
+        "service": "Forbes Shire Council"
+      }
+    },
+    {
+      "title": "Frankston City Council",
+      "module": "frankston_vic_gov_au",
+      "default_params": {}
+    },
     {
       "title": "Gold Coast City Council",
       "module": "goldcoast_qld_gov_au",
       "default_params": {}
     },
+    {
+      "title": "Gwydir Shire Council",
+      "module": "impactapps_com_au",
+      "default_params": {
+        "service": "Gwydir Shire Council"
+      }
+    },
     {
       "title": "Hobsons Bay City Council",
       "module": "hobsonsbay_vic_gov_au",
@@ -90,6 +156,11 @@
       "module": "hume_vic_gov_au",
       "default_params": {}
     },
+    {
+      "title": "Impact Apps",
+      "module": "impactapps_com_au",
+      "default_params": {}
+    },
     {
       "title": "Inner West Council (NSW)",
       "module": "innerwest_nsw_gov_au",
@@ -115,6 +186,27 @@
       "module": "lakemac_nsw_gov_au",
       "default_params": {}
     },
+    {
+      "title": "Lithgow City Council",
+      "module": "impactapps_com_au",
+      "default_params": {
+        "service": "Lithgow City Council"
+      }
+    },
+    {
+      "title": "Livingstone Shire Council",
+      "module": "impactapps_com_au",
+      "default_params": {
+        "service": "Livingstone Shire Council"
+      }
+    },
+    {
+      "title": "Loddon Shire Council",
+      "module": "impactapps_com_au",
+      "default_params": {
+        "service": "Loddon Shire Council"
+      }
+    },
     {
       "title": "Logan City Council",
       "module": "logan_qld_gov_au",
@@ -150,6 +242,20 @@
       "module": "merri_bek_vic_gov_au",
       "default_params": {}
     },
+    {
+      "title": "Moira Shire Council",
+      "module": "impactapps_com_au",
+      "default_params": {
+        "service": "Moira Shire Council"
+      }
+    },
+    {
+      "title": "Moree Plains Shire Council",
+      "module": "impactapps_com_au",
+      "default_params": {
+        "service": "Moree Plains Shire Council"
+      }
+    },
     {
       "title": "Mosman Council",
       "module": "mosman_nsw_gov_au",
@@ -165,16 +271,37 @@
       "module": "nawma_sa_gov_au",
       "default_params": {}
     },
+    {
+      "title": "Penrith City Council",
+      "module": "impactapps_com_au",
+      "default_params": {
+        "service": "Penrith City Council"
+      }
+    },
     {
       "title": "Port Adelaide Enfield, South Australia",
       "module": "portenf_sa_gov_au",
       "default_params": {}
     },
+    {
+      "title": "Port Macquarie Hastings Council",
+      "module": "impactapps_com_au",
+      "default_params": {
+        "service": "Port Macquarie Hastings Council"
+      }
+    },
     {
       "title": "Port Stephens Council",
       "module": "portstephens_nsw_gov_au",
       "default_params": {}
     },
+    {
+      "title": "Queanbeyan-Palerang Regional Council",
+      "module": "impactapps_com_au",
+      "default_params": {
+        "service": "Queanbeyan-Palerang Regional Council"
+      }
+    },
     {
       "title": "RecycleSmart",
       "module": "recyclesmart_com",
@@ -190,6 +317,27 @@
       "module": "shellharbourwaste_com_au",
       "default_params": {}
     },
+    {
+      "title": "Singleton Council",
+      "module": "impactapps_com_au",
+      "default_params": {
+        "service": "Singleton Council"
+      }
+    },
+    {
+      "title": "Snowy Valleys Council",
+      "module": "impactapps_com_au",
+      "default_params": {
+        "service": "Snowy Valleys Council"
+      }
+    },
+    {
+      "title": "South Burnett Regional Council",
+      "module": "impactapps_com_au",
+      "default_params": {
+        "service": "South Burnett Regional Council"
+      }
+    },
     {
       "title": "Stonnington City Council",
       "module": "stonnington_vic_gov_au",
@@ -205,11 +353,28 @@
       "module": "thehills_nsw_gov_au",
       "default_params": {}
     },
+    {
+      "title": "Town of Victoria Park",
+      "module": "victoriapark_wa_gov_au",
+      "default_params": {}
+    },
+    {
+      "title": "Townsville",
+      "module": "townsville_qld_gov_au",
+      "default_params": {}
+    },
     {
       "title": "Unley City Council (SA)",
       "module": "unley_sa_gov_au",
       "default_params": {}
     },
+    {
+      "title": "Wellington Shire Council",
+      "module": "impactapps_com_au",
+      "default_params": {
+        "service": "Wellington Shire Council"
+      }
+    },
     {
       "title": "Whittlesea City Council",
       "module": "whittlesea_vic_gov_au",
@@ -894,6 +1059,11 @@
       "module": "citiesapps_com",
       "default_params": {}
     },
+    {
+      "title": "Leibnitz",
+      "module": "citiesapps_com",
+      "default_params": {}
+    },
     {
       "title": "Leithaprodersdorf",
       "module": "citiesapps_com",
@@ -1634,6 +1804,67 @@
     }
   ],
   "Denmark": [
+    {
+      "title": "Affaldonline",
+      "module": "affaldonline_dk",
+      "default_params": {}
+    },
+    {
+      "title": "Assens Forsyning",
+      "module": "affaldonline_dk",
+      "default_params": {
+        "municipality": "assens"
+      }
+    },
+    {
+      "title": "Fan\u00f8 Kommune",
+      "module": "affaldonline_dk",
+      "default_params": {
+        "municipality": "fanoe"
+      }
+    },
+    {
+      "title": "Favrskov Forsyning",
+      "module": "affaldonline_dk",
+      "default_params": {
+        "municipality": "favrskov"
+      }
+    },
+    {
+      "title": "Fredericia Kommune Affald & Genbrug",
+      "module": "affaldonline_dk",
+      "default_params": {
+        "municipality": "fredericia"
+      }
+    },
+    {
+      "title": "Langeland Forsyning",
+      "module": "affaldonline_dk",
+      "default_params": {
+        "municipality": "langeland"
+      }
+    },
+    {
+      "title": "Middelfart Kommune",
+      "module": "affaldonline_dk",
+      "default_params": {
+        "municipality": "middelfart"
+      }
+    },
+    {
+      "title": "Nyborg Forsyning & Service A/S",
+      "module": "affaldonline_dk",
+      "default_params": {
+        "municipality": "nyborg"
+      }
+    },
+    {
+      "title": "Rebild Kommune",
+      "module": "affaldonline_dk",
+      "default_params": {
+        "municipality": "rebild"
+      }
+    },
     {
       "title": "Renosyd",
       "module": "renosyd_dk",
@@ -1643,6 +1874,41 @@
       "title": "RenoWeb",
       "module": "renoweb_dk",
       "default_params": {}
+    },
+    {
+      "title": "Silkeborg Forsyning",
+      "module": "affaldonline_dk",
+      "default_params": {
+        "municipality": "silkeborg"
+      }
+    },
+    {
+      "title": "Sor\u00f8 Kommune",
+      "module": "affaldonline_dk",
+      "default_params": {
+        "municipality": "soroe"
+      }
+    },
+    {
+      "title": "Vejle Kommune",
+      "module": "affaldonline_dk",
+      "default_params": {
+        "municipality": "vejle"
+      }
+    },
+    {
+      "title": "\u00c6r\u00f8 Kommune",
+      "module": "affaldonline_dk",
+      "default_params": {
+        "municipality": "aeroe"
+      }
+    }
+  ],
+  "Finland": [
+    {
+      "title": "Kiertokapula Finland",
+      "module": "kiertokapula_fi",
+      "default_params": {}
     }
   ],
   "France": [
@@ -1682,6 +1948,11 @@
       "module": "abfall_io",
       "default_params": {}
     },
+    {
+      "title": "Abfallbehandlungsgesellschaft Havelland mbH (abh)",
+      "module": "abfall_havelland_de",
+      "default_params": {}
+    },
     {
       "title": "Abfallbewirtschaftung Ostalbkreis",
       "module": "abfall_io",
@@ -2133,6 +2404,11 @@
         "service": "Dus"
       }
     },
+    {
+      "title": "AWISTA LOGISTIK Stadt Remscheid",
+      "module": "monaloga_de",
+      "default_params": {}
+    },
     {
       "title": "AWL Neuss",
       "module": "awlneuss_de",
@@ -2383,6 +2659,13 @@
         "subdomain": "ebkds"
       }
     },
+    {
+      "title": "Entsorgung Dortmund GmbH (EDG)",
+      "module": "app_abfallplus_de",
+      "default_params": {
+        "app_id": "de.edg.abfallapp"
+      }
+    },
     {
       "title": "Entsorgungs- und Wirtschaftsbetrieb Landau in der Pfalz",
       "module": "c_trace_de",
@@ -2439,6 +2722,13 @@
         "app_id": "de.k4systems.unterallgaeu"
       }
     },
+    {
+      "title": "Frankfurt (Oder)",
+      "module": "app_abfallplus_de",
+      "default_params": {
+        "app_id": "de.k4systems.willkommen"
+      }
+    },
     {
       "title": "Freiburg im Breisgau",
       "module": "app_abfallplus_de",
@@ -2647,6 +2937,13 @@
       "module": "ks_boerde_de",
       "default_params": {}
     },
+    {
+      "title": "Kreis Ahrweiler",
+      "module": "app_abfallplus_de",
+      "default_params": {
+        "app_id": "de.ahrweiler.meinawb"
+      }
+    },
     {
       "title": "Kreis Augsburg",
       "module": "app_abfallplus_de",
@@ -2682,6 +2979,13 @@
         "app_id": "de.k4systems.zakb"
       }
     },
+    {
+      "title": "Kreis Biberach",
+      "module": "app_abfallplus_de",
+      "default_params": {
+        "app_id": "de.biberach.abfallapp"
+      }
+    },
     {
       "title": "Kreis Breisgau-Hochschwarzwald",
       "module": "app_abfallplus_de",
@@ -2976,13 +3280,6 @@
         "app_id": "de.k4systems.abfallappts"
       }
     },
-    {
-      "title": "Kreis Trier-Saarburg",
-      "module": "app_abfallplus_de",
-      "default_params": {
-        "app_id": "de.k4systems.abfallappart"
-      }
-    },
     {
       "title": "Kreis Uelzen",
       "module": "app_abfallplus_de",
@@ -3154,6 +3451,13 @@
         "customer": "coburg"
       }
     },
+    {
+      "title": "Landkreis Cuxhaven",
+      "module": "abfall_io",
+      "default_params": {
+        "key": "49fe8a63a056adbfc43f051f61dd4a44"
+      }
+    },
     {
       "title": "Landkreis Eichst\u00e4tt (MyMuell App)",
       "module": "jumomind_de",
@@ -3375,6 +3679,13 @@
         "service": "roth"
       }
     },
+    {
+      "title": "Landkreis Rottweil",
+      "module": "abfall_io",
+      "default_params": {
+        "key": "d287412901d68d66825e588a60c94641"
+      }
+    },
     {
       "title": "Landkreis Schweinfurt",
       "module": "awido_de",
@@ -3476,6 +3787,13 @@
         "service": "maintauberkreis-abfallkalender"
       }
     },
+    {
+      "title": "Landratsamt Regensburg",
+      "module": "awido_de",
+      "default_params": {
+        "customer": "lra-regensburg"
+      }
+    },
     {
       "title": "Landratsamt Traunstein",
       "module": "abfall_io",
@@ -3551,6 +3869,13 @@
         "service_id": "mymuell"
       }
     },
+    {
+      "title": "Mannheim",
+      "module": "app_abfallplus_de",
+      "default_params": {
+        "app_id": "abfallMA.ucom.de"
+      }
+    },
     {
       "title": "Mechernich und Kommunen",
       "module": "app_abfallplus_de",
@@ -3711,6 +4036,13 @@
         "app_id": "de.k4systems.unterallgaeu"
       }
     },
+    {
+      "title": "Prignitz",
+      "module": "app_abfallplus_de",
+      "default_params": {
+        "app_id": "de.k4systems.willkommen"
+      }
+    },
     {
       "title": "Pullach im Isartal",
       "module": "awido_de",
@@ -3784,6 +4116,13 @@
         "app_id": "de.k4systems.unterallgaeu"
       }
     },
+    {
+      "title": "Rottweil",
+      "module": "app_abfallplus_de",
+      "default_params": {
+        "app_id": "de.k4systems.willkommen"
+      }
+    },
     {
       "title": "RSAG Rhein-Sieg-Kreis",
       "module": "muellmax_de",
@@ -4088,6 +4427,13 @@
         "app_id": "de.k4systems.unterallgaeu"
       }
     },
+    {
+      "title": "Tuttlingen",
+      "module": "app_abfallplus_de",
+      "default_params": {
+        "app_id": "de.k4systems.willkommen"
+      }
+    },
     {
       "title": "T\u00fcbingen",
       "module": "app_abfallplus_de",
@@ -4158,6 +4504,13 @@
         "app_id": "de.k4systems.unterallgaeu"
       }
     },
+    {
+      "title": "Waldshut",
+      "module": "app_abfallplus_de",
+      "default_params": {
+        "app_id": "de.k4systems.willkommen"
+      }
+    },
     {
       "title": "WBO Wirtschaftsbetriebe Oberhausen",
       "module": "abfallnavi_de",
@@ -4173,7 +4526,7 @@
       }
     },
     {
-      "title": "Wermelskirchen",
+      "title": "Wermelskirchen (Service Down)",
       "module": "wermelskirchen_de",
       "default_params": {}
     },
@@ -4232,7 +4585,7 @@
       }
     },
     {
-      "title": "ZAW-SR Straubing",
+      "title": "ZAW-SR",
       "module": "app_abfallplus_de",
       "default_params": {
         "app_id": "de.zawsr"
@@ -4671,6 +5024,11 @@
     }
   ],
   "Poland": [
+    {
+      "title": "Bydgoszcz Pronatura",
+      "module": "pronatura_bydgoszcz_pl",
+      "default_params": {}
+    },
     {
       "title": "Ecoharmonogram",
       "module": "ecoharmonogram_pl",
@@ -4682,10 +5040,15 @@
       "default_params": {}
     },
     {
-      "title": "Pozna\u0144/Kozieg\u0142owy/Objezierze/Oborniki",
+      "title": "Kozieg\u0142owy/Objezierze/Oborniki",
       "module": "sepan_remondis_pl",
       "default_params": {}
     },
+    {
+      "title": "Pozna\u0144",
+      "module": "poznan_pl",
+      "default_params": {}
+    },
     {
       "title": "Warsaw",
       "module": "warszawa19115_pl",
@@ -5096,6 +5459,11 @@
       "module": "ambervalley_gov_uk",
       "default_params": {}
     },
+    {
+      "title": "Ards and North Down Borough Council",
+      "module": "ardsandnorthdown_gov_uk",
+      "default_params": {}
+    },
     {
       "title": "Ashfield District Council",
       "module": "ashfield_gov_uk",
@@ -5146,6 +5514,11 @@
       "module": "binzone_uk",
       "default_params": {}
     },
+    {
+      "title": "Birmingham City Council",
+      "module": "birmingham_gov_uk",
+      "default_params": {}
+    },
     {
       "title": "Blackburn with Darwen Borough Council",
       "module": "blackburn_gov_uk",
@@ -5161,6 +5534,11 @@
       "module": "west_norfolk_gov_uk",
       "default_params": {}
     },
+    {
+      "title": "Borough of Broxbourne Council",
+      "module": "broxbourne_gov_uk",
+      "default_params": {}
+    },
     {
       "title": "Bracknell Forest Council",
       "module": "bracknell_forest_gov_uk",
@@ -5191,6 +5569,11 @@
       "module": "south_norfolk_and_broadland_gov_uk",
       "default_params": {}
     },
+    {
+      "title": "Bromsgrove City Council",
+      "module": "bromsgrove_gov_uk",
+      "default_params": {}
+    },
     {
       "title": "Broxtowe Borough Council",
       "module": "broxtowe_gov_uk",
@@ -5206,6 +5589,11 @@
       "module": "burnley_gov_uk",
       "default_params": {}
     },
+    {
+      "title": "Bury Council",
+      "module": "bury_gov_uk",
+      "default_params": {}
+    },
     {
       "title": "Cambridge City Council",
       "module": "cambridge_gov_uk",
@@ -5291,11 +5679,21 @@
       "module": "croydon_gov_uk",
       "default_params": {}
     },
+    {
+      "title": "Darlington Borough Council",
+      "module": "darlington_gov_uk",
+      "default_params": {}
+    },
     {
       "title": "Denbighshire County Council",
       "module": "denbighshire_gov_uk",
       "default_params": {}
     },
+    {
+      "title": "Denbighshire County Council",
+      "module": "solihull_gov_uk",
+      "default_params": {}
+    },
     {
       "title": "Derby City Council",
       "module": "derby_gov_uk",
@@ -5311,6 +5709,11 @@
       "module": "durham_gov_uk",
       "default_params": {}
     },
+    {
+      "title": "East Ayrshire Council",
+      "module": "east_ayrshire_gov_uk",
+      "default_params": {}
+    },
     {
       "title": "East Cambridgeshire District Council",
       "module": "eastcambs_gov_uk",
@@ -5453,6 +5856,11 @@
       "module": "horsham_gov_uk",
       "default_params": {}
     },
+    {
+      "title": "Hull City Council",
+      "module": "hull_gov_uk",
+      "default_params": {}
+    },
     {
       "title": "Huntingdonshire District Council",
       "module": "huntingdonshire_gov_uk",
@@ -5610,6 +6018,11 @@
       "module": "newport_gov_uk",
       "default_params": {}
     },
+    {
+      "title": "North Ayrshire Council",
+      "module": "north_ayrshire_gov_uk",
+      "default_params": {}
+    },
     {
       "title": "North Herts Council",
       "module": "northherts_gov_uk",
@@ -5695,6 +6108,11 @@
       "module": "reigatebanstead_gov_uk",
       "default_params": {}
     },
+    {
+      "title": "Renfrewshire Council",
+      "module": "renfrewshire_gov_uk",
+      "default_params": {}
+    },
     {
       "title": "Rhondda Cynon Taf County Borough Council",
       "module": "rctcbc_gov_uk",
@@ -5795,6 +6213,11 @@
       "module": "sholland_gov_uk",
       "default_params": {}
     },
+    {
+      "title": "South Kesteven District Council",
+      "module": "southkesteven_gov_uk",
+      "default_params": {}
+    },
     {
       "title": "South Norfolk Council",
       "module": "south_norfolk_and_broadland_gov_uk",
@@ -5926,6 +6349,11 @@
       "module": "uttlesford_gov_uk",
       "default_params": {}
     },
+    {
+      "title": "Vale of Glamorgan Council",
+      "module": "valeofglamorgan_gov_uk",
+      "default_params": {}
+    },
     {
       "title": "Vale of White Horse District Council",
       "module": "binzone_uk",
@@ -6020,6 +6448,11 @@
       "module": "wokingham_gov_uk",
       "default_params": {}
     },
+    {
+      "title": "Wychavon District Council",
+      "module": "wychavon_gov_uk",
+      "default_params": {}
+    },
     {
       "title": "Wyre Forest District Council",
       "module": "wyreforestdc_gov_uk",
diff --git a/custom_components/waste_collection_schedule/translations/en.json b/custom_components/waste_collection_schedule/translations/en.json
index 5fc1069f..75a2da95 100644
--- a/custom_components/waste_collection_schedule/translations/en.json
+++ b/custom_components/waste_collection_schedule/translations/en.json
@@ -255,7 +255,9 @@
           "headers": "Headers",
           "start": "Start",
           "count": "Count",
-          "interval": "Interval"
+          "interval": "Interval",
+          "bill_number": "Bill Number",
+          "values": "Values"
         },
         "data_description": {
           "calendar_title": "A more readable, or user-friendly, name for the waste calendar. If nothing is provided, the name returned by the source will be used."
@@ -494,7 +496,9 @@
           "headers": "Headers",
           "start": "Start",
           "count": "Count",
-          "interval": "Interval"
+          "interval": "Interval",
+          "bill_number": "Bill Number",
+          "values": "Values"
         }
       }
     },
diff --git a/doc/contributing_source.md b/doc/contributing_source.md
index 53814941..7ba137b9 100644
--- a/doc/contributing_source.md
+++ b/doc/contributing_source.md
@@ -129,7 +129,7 @@ The script iterates through all source files and extracts some meta information
 | TITLE | String | Title of the source. Used as link title in README.md and info.md. |
 | URL | String | Service provider homepage URL. The idea is to help users to identify their service provider if they search for an URL instead of a service provider name. The abbreviated domain name is therefore displayed next to the source title in README.md. |
 | COUNTRY | String | [Optional] Overwrite default country code which is derived from source file name. |
-| EXTRA_INFO | List of Dicts or Callable | [Optional] Used to add extra links in README.md and info.md if the source supports multiple service providers at the same time. The following keys can be added to the dict: `title`, `url`, `country`. In case a key is missing, the corresponding value from the attributes above will be used instead. |
+| EXTRA_INFO | List of Dicts or Callable | [Optional] Used to add extra links in README.md and info.md if the source supports multiple service providers at the same time. The following keys can be added to the dict: `title`, `url`, `country`, `default_params`. In case a key (`title`, `url`, `country`) is missing, the corresponding value from the attributes above will be used instead. The `default_params` is a dictionary that will be auto filled when selecting this extra_info provider in the GUI configuration form. |
 
 Examples:
 
@@ -148,12 +148,18 @@ TITLE = "FCC Environment"
 URL = "https://fccenvironment.co.uk"
 EXTRA_INFO = [
     {
-       "title": "Harborough District Council",
-       "url": "https://harborough.gov.uk"
+        "title": "Harborough District Council",
+        "url": "https://harborough.gov.uk",
+        "default_params": { # optional will be auto filled when selecting in the GUI configuration form
+            "ARG1": "Harborough",
+        }
     },
     {
-       "title": "South Hams District Council",
-       "url": "https://southhams.gov.uk/"
+        "title": "South Hams District Council",
+        "url": "https://southhams.gov.uk/",
+        "default_params": { # optional will be auto filled when selecting in the GUI configuration form
+            "ARG1": "South Hams",
+        }
     },
 ]
 
@@ -161,7 +167,7 @@ EXTRA_INFO = [
 TITLE = "Bürgerportal"
 URL = "https://www.c-trace.de"
 def EXTRA_INFO():
-    return [ { "title": s["title"], "url": s["url"] } for s in SERVICE_MAP ]
+    return [ { "title": s["title"], "url": s["url"] } for s in SERVICE_MAP ] # may also contain the default_params key (see above)
 ```
 
 ## Test the new Source File
diff --git a/doc/installation.md b/doc/installation.md
index 7be5c758..e5db855b 100644
--- a/doc/installation.md
+++ b/doc/installation.md
@@ -28,9 +28,9 @@ After installing HACS:
 4. [Configure your waste collection sensor(s)](#configuring-waste-collection-schedules).
 5. Restart Home Assistant.
 
-# Configuring Waste Collection Schedules (YAML)
+# Configuring Waste Collection Schedules
 
-To use Waste Collection Schedules, additional entries need to be made in your `configuration.yaml` file. The required entries are:
+Waste Collection Schedule has two main configuration sections:
 
 1. Configuring source(s)
 
@@ -46,6 +46,31 @@ To use Waste Collection Schedules, additional entries need to be made in your `c
 
    You can also add multiple sensors per source if you are going to display the information in separate entities. For example,  if you want each waste type to have its own entity, you can add one sensor per collection type.
 
+## GUI Configuration
+
+As of version 2.0.0 of the Waste Collection Schedule component, you can configure the component using the Home Assistant GUI. This is the recommended way for most configurations. There are a few limitations for advanced configurations, which can still be done using `configuration.yaml`.
+
+### Adding Integrations
+
+1. You can add sources and sensors like adding any other integration in Home Assistant. Just go to `Configuration` -> `Integrations` -> `Add Integration` and search for `Waste Collection Schedule`.
+1. You will be asked to select your country (or Generic)
+1. You will be asked to select your service provider
+1. You will be asked to enter the required arguments for the service provider (you can find a detailed description of the arguments in the documentation of the source you selected (linked in the [README](/README.md#supported-service-providers))) and the name of the calendar.
+1. You will be asked to select the waste types you to customize (you will be able to change the name, icon, and picture of the waste type and decide if you want to show or hide it). Detailed information can be found in the [Attributes for customize](#attributes-for-customize) section.
+1. You will be asked to configure sensors. If you do not want to configure any sensors scroll down and select `Do not create sensor`. Otherwise configure the sensors as described in the [Configuring Sensor(s)](#configuring-sensors) section, if you want to configure multiple sensors, you must select `Add additional sensors` while configuring the previous sensor.
+1. After completing the configuration you can click `CUSTOMIZE` to change some advanced settings described in the [Configuring Source(s)](#configuring-sources) section. You can also change the sensor or customizees here. Or click on the 3 dots and select reconfigure to change attributes of the source.
+
+### GUI limitations
+
+- You cannot define sensors in the YAML configuration that access the GUI sources (or the other way around)
+- You cannot have sensors, that access multiple sources (source_index of YAML configuration)
+- static source configuration is not ideal (but should work)
+- `multiple` sources wrapper is currently not supported
+
+## configuration.yaml
+
+If you want to configure the Waste Collection Schedule using `configuration.yaml`, you can use the YAML snippet below
+
 ## Configuring Source(s)
 
 ```yaml
@@ -109,7 +134,7 @@ Add the following lines to your `configuration.yaml` file:
 ```yaml
 sensor:
   - platform: waste_collection_schedule
-    source_index: SOURCE_INDEX
+    source_index: SOURCE_INDEX # (YAML only)
     name: NAME
     details_format: DETAILS_FORMAT
     count: COUNT
@@ -126,7 +151,7 @@ sensor:
 | Parameter | Type | Requirement | Description |
 |--|--|--|--|
 | platform |  | required | waste_collection_schedule |
-| source_index | int | optional | Used to assign a sensor to a specific source. Only needed if multiple sources are defined. The first source defined is source_index 0, the second source_index 1, etc. If no value is supplied, the default of 0 is used.<br><br>If you want to have a sensor which combines the data from multiple sources, just add a list of sources here. [Example](#combine-data-from-multiple-sources) |
+| source_index *(YAML ONLY)* | int | optional | Used to assign a sensor to a specific source. Only needed if multiple sources are defined. The first source defined is source_index 0, the second source_index 1, etc. If no value is supplied, the default of 0 is used.<br><br>If you want to have a sensor which combines the data from multiple sources, just add a list of sources here. [Example](#combine-data-from-multiple-sources). This parameter is not available when using GUI configuration, as you're adding sensors directly to sources |
 | name | string | required | The name Home Assistant used for this sensor |
 | details_format | string | optional | Specifies the format used to display info in Home Assistant's _more info_ pop-up. Valid values are: `upcoming`, `appointment_types`, `generic` and `hidden`. If no value is supplied, the default of "upcoming" is used. See [options for details_format](#options-for-details_format-parameter) for more details |
 | count | int | optional | Limits Home Assistant's _more info_ popup to displaying the next _int_ collections |
@@ -166,7 +191,7 @@ Examples:
 
 ## Combine Data from multiple Sources
 
-### Combine Sensor Data
+### Combine Sensor Data (YAML only)
 
 To combine data from multiple sources into one sensor, just add the source indexes like that:
 
@@ -178,7 +203,7 @@ To combine data from multiple sources into one sensor, just add the source index
       - 1
 ```
 
-### Combine Source Data
+### Combine Source Data (Not yet supported in GUI)
 
 If you prefer to combine the data into one calendar entity, you can use the [multiple](/doc/source/multiple.md) wrapper source.
 
diff --git a/info.md b/info.md
index bf62af6a..46a3d07a 100644
--- a/info.md
+++ b/info.md
@@ -36,7 +36,7 @@ Waste collection schedules from service provider web sites are updated daily, de
 | Slovenia | Moji odpadki, Ljubljana |
 | Sweden | Affärsverken, Gästrike Återvinnare, Jönköping - June Avfall & Miljö, Landskrona - Svalövs Renhållning, Lerum Vatten och Avlopp, Linköping - Tekniska Verken, Lund Waste Collection, North / Middle Bohuslän - Rambo AB, Region Gotland, Ronneby Miljöteknik, Samverkan Återvinning Miljö (SÅM), SRV Återvinning, SSAM, Sysav Sophämntning, Uppsala Vatten och Avfall AB, VA Syd Sophämntning, VIVAB Sophämtning |
 | Switzerland | A-Region, Alchenstorf, Andwil, Appenzell, Berg, Bühler, Canton of Zürich, Eggersriet, Gais, Gaiserwald, Goldach, Grosswangen, Grub, Heiden, Herisau, Horn, Hundwil, Häggenschwil, Lindau, Lutzenberg, Muolen, Mörschwil, Münchenstein, Münsingen BE, Switzerland, Real Luzern, Rehetobel, Rorschach, Rorschacherberg, Schwellbrunn, Schönengrund, Speicher, Stein, Steinach, Teufen, Thal, Trogen, Tübach, Untereggen, Urnäsch, Wald, Waldkirch, Waldstatt, Wittenbach, Wolfhalden |
-| United Kingdom | Aberdeenshire Council, Adur & Worthing Councils, Allerdale Borough Council, Amber Valley Borough Council, Anglesey, Ards and North Down Borough Council, Ashfield District Council, Ashford Borough Council, Aylesbury Vale District Council, Barnsley Metropolitan Borough Council, Basildon Council, Basingstoke and Deane Borough Council, Bath & North East Somerset Council, BCP Council, Bedford Borough Council, Binzone, Birmingham City Council, Blackburn with Darwen Borough Council, Blackpool Council, Borough Council of King's Lynn & West Norfolk, Borough of Broxbourne Council, Bracknell Forest Council, Bradford Metropolitan District Council, Braintree District Council, Breckland Council, Bristol City Council, Broadland District Council, Bromsgrove City Council, Broxtowe Borough Council, Buckinghamshire Waste Collection - Former Chiltern, South Bucks or Wycombe areas, Burnley Council, Bury Council, Cambridge City Council, Canterbury City Council, Cardiff Council, Central Bedfordshire Council, Cherwell District Council, Cheshire East Council, Cheshire West and Chester Council, Chesterfield Borough Council, Chichester District Council, City of Doncaster Council, City Of Lincoln Council, City of York Council, Colchester City Council, Conwy County Borough Council, Cornwall Council, Crawley Borough Council (myCrawley), Croydon Council, Darlington Borough Council, Denbighshire County Council, Denbighshire County Council, Derby City Council, Dudley Metropolitan Borough Council, Durham County Council, East Ayrshire Council, East Cambridgeshire District Council, East Devon District Council, East Herts Council, East Northamptonshire and Wellingborough, East Renfrewshire Council, East Riding of Yorkshire Council, Eastbourne Borough Council, Eastleigh Borough Council, Elmbridge Borough Council, Environment First, Exeter City Council, Falkirk, Fareham Council, FCC Environment, Fenland District Council, Fife Council, Flintshire, Fylde Council, Gateshead Council, Gedling Borough Council (unofficial), Glasgow City Council, Guildford Borough Council, Gwynedd, Harborough District Council, Haringey Council, Harlow Council, Hart District Council, Herefordshire City Council, Highland, Horsham District Council, Hull City Council, Huntingdonshire District Council, iTouchVision, Joint Waste Solutions, Kirklees Council, Lancaster City Council, Leicester City Council, Lewes District Council, Lichfield District Council, Lisburn and Castlereagh City Council, Liverpool City Council, London Borough of Barking and Dagenham, London Borough of Bexley, London Borough of Bromley, London Borough of Camden, London Borough of Harrow, London Borough of Hounslow, London Borough of Lewisham, London Borough of Merton, London Borough of Newham, Maidstone Borough Council, Maldon District Council, Manchester City Council, Mansfield District Council, Mendip District Council, Mid-Sussex District Council, Middlesbrough Council, Milton Keynes council, Moray Council, Newcastle City Council, Newcastle Under Lyme Borough Council, Newport City Council, North Ayrshire Council, North Herts Council, North Kesteven District Council, North Lincolnshire Council, North Northamptonshire council, North Somerset Council, North West Leicestershire District Council, North Yorkshire Council - Hambleton, North Yorkshire Council - Harrogate, North Yorkshire Council - Scarborough, North Yorkshire Council - Selby, Nottingham City Council, Oxford City Council, Peterborough City Council, Portsmouth City Council, Reading Council, Redbridge Council, Reigate & Banstead Borough Council, Renfrewshire Council, Rhondda Cynon Taf County Borough Council, Richmondshire District Council, Rotherham Metropolitan Borough Council, Runnymede Borough Council, Rushcliffe Brough Council, Rushmoor Borough Council, Salford City Council, Sedgemoor District Council, Sheffield City Council, Shropshire Council, Somerset Council, Somerset County Council, Somerset West & Taunton District Council, South Cambridgeshire District Council, South Derbyshire District Council, South Gloucestershire Council, South Hams District Council, South Holland District Council, South Kesteven District Council, South Norfolk Council, South Oxfordshire District Council, South Somerset District Council, South Tyneside Council, Southampton City Council, Stafford Borough Council, Stevenage Borough Council, Stirling.gov.uk, Stockport Council, Stockton-on-Tees Borough Council, Stoke-on-Trent, Stratford District Council, Surrey Heath Borough Council, Sutton Council, London, Swansea Council, Swindon Borough Council, Tameside Metropolitan Borough Council, Telford and Wrekin Council, Test Valley Borough Council, Tewkesbury Borough Council, The Royal Borough of Kingston Council, Tonbridge and Malling Borough Council, Tunbridge Wells, UK Bin Collection Schedule (UKBCD) project, Uttlesford District Council, Vale of Glamorgan Council, Vale of White Horse District Council, Walsall Council, Warrington Borough Council, Warwick District Council, Waverley Borough Council, Wealden District Council, Welwyn Hatfield Borough Council, West Berkshire Council, West Devon Borough Council, West Dunbartonshire Council, West Northamptonshire council, West Suffolk Council, Westmorland & Furness Council, Barrow area, Westmorland & Furness Council, South Lakeland area, Wigan Council, Wiltshire Council, Windsor and Maidenhead, Wirral Council, Woking Borough Council, Wokingham Borough Council, Wychavon District Council, Wyre Forest District Council |
+| United Kingdom | Aberdeenshire Council, Adur & Worthing Councils, Allerdale Borough Council, Amber Valley Borough Council, Anglesey, Ards and North Down Borough Council, Ashfield District Council, Ashford Borough Council, Aylesbury Vale District Council, Barnsley Metropolitan Borough Council, Basildon Council, Basingstoke and Deane Borough Council, Bath & North East Somerset Council, BCP Council, Bedford Borough Council, Binzone, Birmingham City Council, Blackburn with Darwen Borough Council, Blackpool Council, Borough Council of King's Lynn & West Norfolk, Borough of Broxbourne Council, Bracknell Forest Council, Bradford Metropolitan District Council, Braintree District Council, Breckland Council, Bristol City Council, Broadland District Council, Bromsgrove City Council, Broxtowe Borough Council, Buckinghamshire Waste Collection - Former Chiltern, South Bucks or Wycombe areas, Burnley Council, Bury Council, Cambridge City Council, Canterbury City Council, Cardiff Council, Central Bedfordshire Council, Cherwell District Council, Cheshire East Council, Cheshire West and Chester Council, Chesterfield Borough Council, Chichester District Council, City of Doncaster Council, City Of Lincoln Council, City of York Council, Colchester City Council, Conwy County Borough Council, Cornwall Council, Crawley Borough Council (myCrawley), Croydon Council, Darlington Borough Council, Denbighshire County Council, Denbighshire County Council, Derby City Council, Dudley Metropolitan Borough Council, Durham County Council, East Ayrshire Council, East Cambridgeshire District Council, East Devon District Council, East Herts Council, East Northamptonshire and Wellingborough, East Renfrewshire Council, East Riding of Yorkshire Council, Eastbourne Borough Council, Eastleigh Borough Council, Elmbridge Borough Council, Environment First, Exeter City Council, Falkirk, Fareham Borough Council, FCC Environment, Fenland District Council, Fife Council, Flintshire, Fylde Council, Gateshead Council, Gedling Borough Council (unofficial), Glasgow City Council, Guildford Borough Council, Gwynedd, Harborough District Council, Haringey Council, Harlow Council, Hart District Council, Herefordshire City Council, Highland, Horsham District Council, Hull City Council, Huntingdonshire District Council, iTouchVision, Joint Waste Solutions, Kirklees Council, Lancaster City Council, Leicester City Council, Lewes District Council, Lichfield District Council, Lisburn and Castlereagh City Council, Liverpool City Council, London Borough of Barking and Dagenham, London Borough of Bexley, London Borough of Bromley, London Borough of Camden, London Borough of Harrow, London Borough of Hounslow, London Borough of Lewisham, London Borough of Merton, London Borough of Newham, Maidstone Borough Council, Maldon District Council, Manchester City Council, Mansfield District Council, Mendip District Council, Mid-Sussex District Council, Middlesbrough Council, Milton Keynes council, Moray Council, Newcastle City Council, Newcastle Under Lyme Borough Council, Newport City Council, North Ayrshire Council, North Herts Council, North Kesteven District Council, North Lincolnshire Council, North Northamptonshire council, North Somerset Council, North West Leicestershire District Council, North Yorkshire Council - Hambleton, North Yorkshire Council - Harrogate, North Yorkshire Council - Scarborough, North Yorkshire Council - Selby, Nottingham City Council, Oxford City Council, Peterborough City Council, Portsmouth City Council, Reading Council, Redbridge Council, Reigate & Banstead Borough Council, Renfrewshire Council, Rhondda Cynon Taf County Borough Council, Richmondshire District Council, Rotherham Metropolitan Borough Council, Runnymede Borough Council, Rushcliffe Brough Council, Rushmoor Borough Council, Salford City Council, Sedgemoor District Council, Sheffield City Council, Shropshire Council, Somerset Council, Somerset County Council, Somerset West & Taunton District Council, South Cambridgeshire District Council, South Derbyshire District Council, South Gloucestershire Council, South Hams District Council, South Holland District Council, South Kesteven District Council, South Norfolk Council, South Oxfordshire District Council, South Somerset District Council, South Tyneside Council, Southampton City Council, Stafford Borough Council, Stevenage Borough Council, Stirling.gov.uk, Stockport Council, Stockton-on-Tees Borough Council, Stoke-on-Trent, Stratford District Council, Surrey Heath Borough Council, Sutton Council, London, Swansea Council, Swindon Borough Council, Tameside Metropolitan Borough Council, Telford and Wrekin Council, Test Valley Borough Council, Tewkesbury Borough Council, The Royal Borough of Kingston Council, Tonbridge and Malling Borough Council, Tunbridge Wells, UK Bin Collection Schedule (UKBCD) project, Uttlesford District Council, Vale of Glamorgan Council, Vale of White Horse District Council, Walsall Council, Warrington Borough Council, Warwick District Council, Waverley Borough Council, Wealden District Council, Welwyn Hatfield Borough Council, West Berkshire Council, West Devon Borough Council, West Dunbartonshire Council, West Northamptonshire council, West Suffolk Council, Westmorland & Furness Council, Barrow area, Westmorland & Furness Council, South Lakeland area, Wigan Council, Wiltshire Council, Windsor and Maidenhead, Wirral Council, Woking Borough Council, Wokingham Borough Council, Wychavon District Council, Wyre Forest District Council |
 | United States of America | Albuquerque, New Mexico, USA, City of Austin, TX, City of Bloomington, City of Cambridge, City of Gastonia, NC, City of Georgetown, TX, City of Oklahoma City, City of Pittsburgh, Louisville, Kentucky, USA, Newark, Delaware, USA, Olympia, Washington, USA, ReCollect, Recycle Coach, Republic Services, Seattle Public Utilities, Tucson, Arizona, USA |
 <!--End of country section-->