diff --git a/osu.Game/Beatmaps/BeatmapSet.cs b/osu.Game/Beatmaps/BeatmapSet.cs
index de886f9375..0a9e3335ab 100644
--- a/osu.Game/Beatmaps/BeatmapSet.cs
+++ b/osu.Game/Beatmaps/BeatmapSet.cs
@@ -13,8 +13,7 @@ public class BeatmapSet
     {
         public List<Beatmap> Beatmaps { get; protected set; }
 
-        public string Artist;
-        public string Title;
+        public Metadata Metadata;
 
         public User Creator;
     }
diff --git a/osu.Game/Beatmaps/Metadata.cs b/osu.Game/Beatmaps/Metadata.cs
new file mode 100644
index 0000000000..db0987b3cf
--- /dev/null
+++ b/osu.Game/Beatmaps/Metadata.cs
@@ -0,0 +1,8 @@
+namespace osu.Game.Beatmaps
+{
+    public class Metadata
+    {
+        public string Artist;
+        public string Title;
+    }
+}
\ No newline at end of file
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index ecec8032a9..4d269b3ecf 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -47,6 +47,7 @@
   <ItemGroup>
     <Compile Include="Beatmaps\Beatmap.cs" />
     <Compile Include="Beatmaps\BeatmapSet.cs" />
+    <Compile Include="Beatmaps\Metadata.cs" />
     <Compile Include="Beatmaps\Objects\HitObject.cs" />
     <Compile Include="Beatmaps\Samples\HitSampleInfo.cs" />
     <Compile Include="Beatmaps\Samples\SampleBank.cs" />