diff --git a/source/Models/SiteCacheManager.cs b/source/Helpers/SiteCacheManager.cs
similarity index 95%
rename from source/Models/SiteCacheManager.cs
rename to source/Helpers/SiteCacheManager.cs
index 6694fbd32377114457e13658206c5f05a31af4ee..a689967d5226a716a890a9903ea655cd483cb198 100644
--- a/source/Models/SiteCacheManager.cs
+++ b/source/Helpers/SiteCacheManager.cs
@@ -1,8 +1,9 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using SuCoS.Models;
 
-namespace SuCoS.Models;
+namespace SuCoS.Helpers;
 
 /// <summary>
 /// Manages all the lists and dictionaries used for cache for the site
diff --git a/source/Models/ISite.cs b/source/Models/ISite.cs
index a78e9e681a8b705d26a0f7a38b582fcb5ed13d13..be775bd75448eebffb9725a321e31c26589ee0a4 100644
--- a/source/Models/ISite.cs
+++ b/source/Models/ISite.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using Fluid;
 using Serilog;
+using SuCoS.Helpers;
 using SuCoS.Models.CommandLineOptions;
 
 namespace SuCoS.Models;
diff --git a/source/Models/Site.cs b/source/Models/Site.cs
index f2e353deb772424f238ba89eaca0f09d6865a09d..95ce7f09661048b4cefb783057b0be9f0c00db31 100644
--- a/source/Models/Site.cs
+++ b/source/Models/Site.cs
@@ -7,6 +7,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Fluid;
 using Serilog;
+using SuCoS.Helpers;
 using SuCoS.Models.CommandLineOptions;
 using SuCoS.Parser;
 
@@ -37,10 +38,25 @@ internal class Site : ISite
     #region SiteSettings
 
     /// <summary>
-    /// Site Title.
+    /// Site Title/Name
     /// </summary>
     public string Title => settings.Title;
 
+    /// <summary>
+    /// Site description
+    /// </summary>
+    public string? Description  => settings.Description;
+
+    /// <summary>
+    /// Copyright information
+    /// </summary>
+    public string? Copyright  => settings.Copyright;
+
+    /// <summary>
+    /// The base URL that will be used to build internal links.
+    /// </summary>
+    public string BaseURL  => settings.BaseURL;
+
     /// <summary>
     /// The appearance of a URL is either ugly or pretty.
     /// </summary>
diff --git a/source/Models/SiteSettings.cs b/source/Models/SiteSettings.cs
index 4de5802caa09343263c21079d9274456b7d2fb37..5a523508a84501d0f198724cbe0330332e8d1e6d 100644
--- a/source/Models/SiteSettings.cs
+++ b/source/Models/SiteSettings.cs
@@ -9,19 +9,29 @@ namespace SuCoS.Models;
 public class SiteSettings : IParams
 {
     /// <summary>
-    /// Site Title.
+    /// Site Title/Name.
     /// </summary>
     public string Title { get; set; } = string.Empty;
 
+    /// <summary>
+    /// Site description
+    /// </summary>
+    public string? Description { get; set; }
+
+    /// <summary>
+    /// Copyright information
+    /// </summary>
+    public string? Copyright { get; set; }
+
     /// <summary>
     /// The base URL that will be used to build internal links.
     /// </summary>
-    public string BaseUrl { get; set; } = "./";
+    public string BaseURL { get; set; } = string.Empty;
 
     /// <summary>
     /// The appearance of a URL is either ugly or pretty.
     /// </summary>
-    public bool UglyURLs { get; set; } = false;
+    public bool UglyURLs { get; set; }
 
     #region IParams
 
diff --git a/source/ServerHandlers/StaticFileRequest.cs b/source/ServerHandlers/StaticFileRequest.cs
index a2e849a56d96a1fd2ed505113ba987f5a9f89884..bfa59c451f5d274896a75568741380d8acd62c94 100644
--- a/source/ServerHandlers/StaticFileRequest.cs
+++ b/source/ServerHandlers/StaticFileRequest.cs
@@ -12,7 +12,7 @@ namespace SuCoS.ServerHandlers;
 internal class StaticFileRequest : IServerHandlers
 {
     private readonly string basePath;
-    private bool inTheme;
+    private readonly bool inTheme;
 
     /// <summary>
     /// Constructor
diff --git a/test/Parser/YAMLParserTests.cs b/test/Parser/YAMLParserTests.cs
index 7bc74f6034abfe538ddf8657f5943b2417e0c4af..cd746f052d8ab219f6f9d52495aea8e91506a56b 100644
--- a/test/Parser/YAMLParserTests.cs
+++ b/test/Parser/YAMLParserTests.cs
@@ -43,7 +43,9 @@ This is a test using real data. Real Data Test
 ";
     private const string siteContentCONST = @"
 Title: My Site
-BaseUrl: https://www.example.com/
+BaseURL: https://www.example.com/
+Description: Tastiest C# Static Site Generator of the World
+Copyright: Copyright message
 customParam: Custom Value
 NestedData:
   Level2:
@@ -151,9 +153,12 @@ Title
         // Act
         var site = parser.ParseSiteSettings(siteContentCONST);
 
+
         // Asset
-        Assert.Equal("https://www.example.com/", site.BaseUrl);
         Assert.Equal("My Site", site.Title);
+        Assert.Equal("https://www.example.com/", site.BaseURL);
+        Assert.Equal("Tastiest C# Static Site Generator of the World", site.Description);
+        Assert.Equal("Copyright message", site.Copyright);
     }
 
     [Fact]
@@ -254,7 +259,7 @@ Title
         var site = parser.ParseSiteSettings(siteContentCONST);
         Assert.NotNull(site);
         Assert.Equal("My Site", site.Title);
-        Assert.Equal("https://www.example.com/", site.BaseUrl);
+        Assert.Equal("https://www.example.com/", site.BaseURL);
     }
 
     [Fact]
diff --git a/test/ServerHandlers/RegisteredPageRequestHandlerTests.cs b/test/ServerHandlers/RegisteredPageRequestHandlerTests.cs
index ccf7d538478d08352542436bb4b0251215eb76bc..eb2a175675819cb9594e9060d79671b7bb2adb71 100644
--- a/test/ServerHandlers/RegisteredPageRequestHandlerTests.cs
+++ b/test/ServerHandlers/RegisteredPageRequestHandlerTests.cs
@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Http;
-using SuCoS.Models;
 using SuCoS.Models.CommandLineOptions;
 using SuCoS.ServerHandlers;
 using Xunit;