diff --git a/README.md b/README.md
index 7cefd74..fd233dc 100644
--- a/README.md
+++ b/README.md
@@ -46,8 +46,11 @@ baseurl = "https://example.com/"
 title = "SiteTitle"
 theme = "hugo_theme_robust"
 
-googleAnalytics = "UA-XXXXXXXX-XX" # Optional
-disqusShortname = "XYW"
+[services]
+  [services.disqus]
+    shortname = ''
+  [services.googleAnalytics]
+    id = 'UA-XXXXXXXX-XX' # Optical
 
 [params]
 description = "This is site description"
diff --git a/layouts/_default/baseof.amp.html b/layouts/_default/baseof.amp.html
index 61071da..f1d7654 100644
--- a/layouts/_default/baseof.amp.html
+++ b/layouts/_default/baseof.amp.html
@@ -7,7 +7,7 @@
     {{ partial "meta.html" . }}
     {{ block "meta" . }}{{ end }}
 
-    {{ if and .Site.GoogleAnalytics (ne (getenv "HUGO_ENV") "DEV") }}
+    {{ if and .Site.Config.Services.GoogleAnalytics.ID (ne (getenv "HUGO_ENV") "DEV") }}
     <script async custom-element="amp-analytics" src="https://cdn.ampproject.org/v0/amp-analytics-0.1.js"></script>
     <meta name="amp-google-client-id-api" content="googleanalytics">
     {{ end }}
@@ -45,14 +45,14 @@
   </head>
 
   <body>
-    {{ if and .Site.GoogleAnalytics (ne (getenv "HUGO_ENV") "DEV") }}
+    {{ if and .Site.Config.Services.GoogleAnalytics.ID (ne (getenv "HUGO_ENV") "DEV") }}
     <amp-analytics type="gtag" data-credentials="include">
       <script type="application/json">
       {
         "vars" : {
-          "gtag_id": "{{ .Site.GoogleAnalytics }}}",
+          "gtag_id": "{{ .Site.Config.Services.GoogleAnalytics.ID }}}",
           "config" : {
-            "{{ .Site.GoogleAnalytics }}}": { "groups": "default" }
+            "{{ .Site.Config.Services.GoogleAnalytics.ID }}}": { "groups": "default" }
           }
         }
       }
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index e6aef3b..1cb647a 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -44,15 +44,15 @@
 {{ with .Site.Params.logofontfamily }} .h-logo { font-family: {{ . | safeCSS }}; } {{ end }}
 {{ partial "custom.css" . | safeCSS }}
     </style>
-{{ if and .Site.GoogleAnalytics (ne (getenv "HUGO_ENV") "DEV") }}
+{{ if and .Site.Config.Services.GoogleAnalytics.ID (ne (getenv "HUGO_ENV") "DEV") }}
 <!-- Global site tag (gtag.js) - Google Analytics -->
-<script async src="https://www.googletagmanager.com/gtag/js?id={{ .Site.GoogleAnalytics }}"></script>
+<script async src="https://www.googletagmanager.com/gtag/js?id={{ .Site.Config.Services.GoogleAnalytics.ID }}"></script>
 <script>
   window.dataLayer = window.dataLayer || [];
   function gtag(){dataLayer.push(arguments);}
   gtag('js', new Date());
 
-  gtag('config', '{{ .Site.GoogleAnalytics }}');
+  gtag('config', '{{ .Site.Config.Services.GoogleAnalytics.ID }}');
 </script>
 {{ end }}
   </head>
