From b597a773f5095f4c8f8d17f3bfa43305141c2e84 Mon Sep 17 00:00:00 2001
From: wo80 <christian.woltering@tu-dortmund.de>
Date: Sat, 11 Oct 2025 10:46:02 +0200
Subject: [PATCH 1/8] Refactor services (1)

Consistently return QueryResult instead of specialized types from search and browse requests.
---
 src/Hqub.MusicBrainz.Client/Example6.cs       |   4 +-
 .../ArtistBrowseTests.cs                      |   4 +-
 .../ArtistSearchTests.cs                      |   4 +-
 .../LabelBrowseTests.cs                       |   4 +-
 .../LabelSearchTests.cs                       |   4 +-
 .../RecordingBrowseTests.cs                   |   4 +-
 .../RecordingSearchTests.cs                   |   4 +-
 .../ReleaseBrowseTests.cs                     |   4 +-
 .../ReleaseGroupBrowseTests.cs                |   4 +-
 .../ReleaseGroupSearchTests.cs                |   4 +-
 .../ReleaseSearchTests.cs                     |   4 +-
 .../Entities/Collections/ArtistList.cs        |  42 ++----
 .../Entities/Collections/LabelList.cs         |  39 ++---
 .../Entities/Collections/RecordingList.cs     |  36 ++---
 .../Entities/Collections/ReleaseGroupList.cs  |  39 ++---
 .../Entities/Collections/ReleaseList.cs       |  37 ++---
 src/Hqub.MusicBrainz/QueryResult.cs           |  17 ++-
 .../Services/ArtistService.cs                 |  22 +--
 .../Services/BrowseRequest.cs                 |  35 ++---
 .../Services/IArtistService.cs                |  13 +-
 .../Services/ILabelService.cs                 |  13 +-
 .../Services/IRecordingService.cs             |  13 +-
 .../Services/IReleaseGroupService.cs          |  15 +-
 .../Services/IReleaseService.cs               |  15 +-
 src/Hqub.MusicBrainz/Services/LabelService.cs |  22 +--
 .../Services/RecordingService.cs              |  22 +--
 .../Services/ReleaseGroupService.cs           |  26 ++--
 .../Services/ReleaseService.cs                |  26 ++--
 .../Services/SearchRequest.cs                 | 134 +++++++++++++++---
 29 files changed, 307 insertions(+), 303 deletions(-)

diff --git a/src/Hqub.MusicBrainz.Client/Example6.cs b/src/Hqub.MusicBrainz.Client/Example6.cs
index fdcde91..cbad4cf 100644
--- a/src/Hqub.MusicBrainz.Client/Example6.cs
+++ b/src/Hqub.MusicBrainz.Client/Example6.cs
@@ -89,7 +89,7 @@ public static async Task Search(MusicBrainzClient client, string genre, int limi
             }
         }
 
-        private static void DisplayArtists(ArtistList artists)
+        private static void DisplayArtists(QueryResult<Artist> artists)
         {
             foreach (var a in artists)
             {
@@ -98,7 +98,7 @@ private static void DisplayArtists(ArtistList artists)
             }
         }
 
-        private static void DisplayReleases(ReleaseGroupList groups, int i, int pages)
+        private static void DisplayReleases(QueryResult<ReleaseGroup> groups, int i, int pages)
         {
             Console.WriteLine();
             Console.WriteLine("Page {0} of {1}", i, pages);
diff --git a/src/Hqub.MusicBrainz.Tests/ArtistBrowseTests.cs b/src/Hqub.MusicBrainz.Tests/ArtistBrowseTests.cs
index e7561fb..0d52454 100644
--- a/src/Hqub.MusicBrainz.Tests/ArtistBrowseTests.cs
+++ b/src/Hqub.MusicBrainz.Tests/ArtistBrowseTests.cs
@@ -1,6 +1,6 @@
 namespace Hqub.MusicBrainz.Tests
 {
-    using Hqub.MusicBrainz.Entities.Collections;
+    using Hqub.MusicBrainz.Entities;
     using NUnit.Framework;
     using System.Threading.Tasks;
 
@@ -9,7 +9,7 @@
 
     public class ArtistBrowseTests
     {
-        private ArtistList data;
+        private QueryResult<Artist> data;
 
         [OneTimeSetUp]
         public async Task Init()
diff --git a/src/Hqub.MusicBrainz.Tests/ArtistSearchTests.cs b/src/Hqub.MusicBrainz.Tests/ArtistSearchTests.cs
index b79c14d..a85cd20 100644
--- a/src/Hqub.MusicBrainz.Tests/ArtistSearchTests.cs
+++ b/src/Hqub.MusicBrainz.Tests/ArtistSearchTests.cs
@@ -1,6 +1,6 @@
 namespace Hqub.MusicBrainz.Tests
 {
-    using Hqub.MusicBrainz.Entities.Collections;
+    using Hqub.MusicBrainz.Entities;
     using NUnit.Framework;
     using System.Threading.Tasks;
 
@@ -9,7 +9,7 @@
 
     public class ArtistSearchTests
     {
-        private ArtistList data;
+        private QueryResult<Artist> data;
 
         [OneTimeSetUp]
         public async Task Init()
diff --git a/src/Hqub.MusicBrainz.Tests/LabelBrowseTests.cs b/src/Hqub.MusicBrainz.Tests/LabelBrowseTests.cs
index 3a8bec4..31ea34d 100644
--- a/src/Hqub.MusicBrainz.Tests/LabelBrowseTests.cs
+++ b/src/Hqub.MusicBrainz.Tests/LabelBrowseTests.cs
@@ -1,6 +1,6 @@
 namespace Hqub.MusicBrainz.Tests
 {
-    using Hqub.MusicBrainz.Entities.Collections;
+    using Hqub.MusicBrainz.Entities;
     using NUnit.Framework;
     using System.Threading.Tasks;
 
@@ -9,7 +9,7 @@
 
     public class LabelBrowseTests
     {
-        private LabelList data;
+        private QueryResult<Label> data;
 
         [OneTimeSetUp]
         public async Task Init()
diff --git a/src/Hqub.MusicBrainz.Tests/LabelSearchTests.cs b/src/Hqub.MusicBrainz.Tests/LabelSearchTests.cs
index 8d4cbda..e891012 100644
--- a/src/Hqub.MusicBrainz.Tests/LabelSearchTests.cs
+++ b/src/Hqub.MusicBrainz.Tests/LabelSearchTests.cs
@@ -1,6 +1,6 @@
 namespace Hqub.MusicBrainz.Tests
 {
-    using Hqub.MusicBrainz.Entities.Collections;
+    using Hqub.MusicBrainz.Entities;
     using NUnit.Framework;
     using System.Threading.Tasks;
 
@@ -9,7 +9,7 @@
 
     public class LabelSearchTests
     {
-        private LabelList data;
+        private QueryResult<Label> data;
 
         [OneTimeSetUp]
         public async Task Init()
diff --git a/src/Hqub.MusicBrainz.Tests/RecordingBrowseTests.cs b/src/Hqub.MusicBrainz.Tests/RecordingBrowseTests.cs
index 26d296b..ce6edba 100644
--- a/src/Hqub.MusicBrainz.Tests/RecordingBrowseTests.cs
+++ b/src/Hqub.MusicBrainz.Tests/RecordingBrowseTests.cs
@@ -1,6 +1,6 @@
 namespace Hqub.MusicBrainz.Tests
 {
-    using Hqub.MusicBrainz.Entities.Collections;
+    using Hqub.MusicBrainz.Entities;
     using NUnit.Framework;
     using System.Threading.Tasks;
 
@@ -9,7 +9,7 @@
 
     public class RecordingBrowseTests
     {
-        private RecordingList data;
+        private QueryResult<Recording> data;
 
         [OneTimeSetUp]
         public async Task Init()
diff --git a/src/Hqub.MusicBrainz.Tests/RecordingSearchTests.cs b/src/Hqub.MusicBrainz.Tests/RecordingSearchTests.cs
index 8a06122..eb8ab74 100644
--- a/src/Hqub.MusicBrainz.Tests/RecordingSearchTests.cs
+++ b/src/Hqub.MusicBrainz.Tests/RecordingSearchTests.cs
@@ -1,6 +1,6 @@
 namespace Hqub.MusicBrainz.Tests
 {
-    using Hqub.MusicBrainz.Entities.Collections;
+    using Hqub.MusicBrainz.Entities;
     using NUnit.Framework;
     using System.Linq;
     using System.Threading.Tasks;
@@ -10,7 +10,7 @@
 
     public class RecordingSearchTests
     {
-        private RecordingList data;
+        private QueryResult<Recording> data;
 
         [OneTimeSetUp]
         public async Task Init()
diff --git a/src/Hqub.MusicBrainz.Tests/ReleaseBrowseTests.cs b/src/Hqub.MusicBrainz.Tests/ReleaseBrowseTests.cs
index 8580794..449ee47 100644
--- a/src/Hqub.MusicBrainz.Tests/ReleaseBrowseTests.cs
+++ b/src/Hqub.MusicBrainz.Tests/ReleaseBrowseTests.cs
@@ -1,6 +1,6 @@
 namespace Hqub.MusicBrainz.Tests
 {
-    using Hqub.MusicBrainz.Entities.Collections;
+    using Hqub.MusicBrainz.Entities;
     using NUnit.Framework;
     using System.Threading.Tasks;
 
@@ -9,7 +9,7 @@
 
     public class ReleaseBrowseTests
     {
-        private ReleaseList data;
+        private QueryResult<Release> data;
 
         [OneTimeSetUp]
         public async Task Init()
diff --git a/src/Hqub.MusicBrainz.Tests/ReleaseGroupBrowseTests.cs b/src/Hqub.MusicBrainz.Tests/ReleaseGroupBrowseTests.cs
index 3f0e78b..0d86aae 100644
--- a/src/Hqub.MusicBrainz.Tests/ReleaseGroupBrowseTests.cs
+++ b/src/Hqub.MusicBrainz.Tests/ReleaseGroupBrowseTests.cs
@@ -1,6 +1,6 @@
 namespace Hqub.MusicBrainz.Tests
 {
-    using Hqub.MusicBrainz.Entities.Collections;
+    using Hqub.MusicBrainz.Entities;
     using NUnit.Framework;
     using System.Threading.Tasks;
 
@@ -9,7 +9,7 @@
 
     public class ReleaseGroupBrowseTests
     {
-        private ReleaseGroupList data;
+        private QueryResult<ReleaseGroup> data;
 
         [OneTimeSetUp]
         public async Task Init()
diff --git a/src/Hqub.MusicBrainz.Tests/ReleaseGroupSearchTests.cs b/src/Hqub.MusicBrainz.Tests/ReleaseGroupSearchTests.cs
index e4c9d85..81660fc 100644
--- a/src/Hqub.MusicBrainz.Tests/ReleaseGroupSearchTests.cs
+++ b/src/Hqub.MusicBrainz.Tests/ReleaseGroupSearchTests.cs
@@ -1,6 +1,6 @@
 namespace Hqub.MusicBrainz.Tests
 {
-    using Hqub.MusicBrainz.Entities.Collections;
+    using Hqub.MusicBrainz.Entities;
     using NUnit.Framework;
     using System.Linq;
     using System.Threading.Tasks;
@@ -10,7 +10,7 @@
 
     public class ReleaseGroupSearchTests
     {
-        private ReleaseGroupList data;
+        private QueryResult<ReleaseGroup> data;
 
         [OneTimeSetUp]
         public async Task Init()
diff --git a/src/Hqub.MusicBrainz.Tests/ReleaseSearchTests.cs b/src/Hqub.MusicBrainz.Tests/ReleaseSearchTests.cs
index f9a0f91..a4f8d48 100644
--- a/src/Hqub.MusicBrainz.Tests/ReleaseSearchTests.cs
+++ b/src/Hqub.MusicBrainz.Tests/ReleaseSearchTests.cs
@@ -1,6 +1,6 @@
 namespace Hqub.MusicBrainz.Tests
 {
-    using Hqub.MusicBrainz.Entities.Collections;
+    using Hqub.MusicBrainz.Entities;
     using NUnit.Framework;
     using System.Threading.Tasks;
 
@@ -9,7 +9,7 @@
 
     public class ReleaseSearchTests
     {
-        private ReleaseList data;
+        private QueryResult<Release> data;
 
         [OneTimeSetUp]
         public async Task Init()
diff --git a/src/Hqub.MusicBrainz/Entities/Collections/ArtistList.cs b/src/Hqub.MusicBrainz/Entities/Collections/ArtistList.cs
index 9fb6468..f3ec552 100644
--- a/src/Hqub.MusicBrainz/Entities/Collections/ArtistList.cs
+++ b/src/Hqub.MusicBrainz/Entities/Collections/ArtistList.cs
@@ -4,51 +4,31 @@ namespace Hqub.MusicBrainz.Entities.Collections
     using System.Collections.Generic;
     using System.Runtime.Serialization;
 
-    /// <summary>
-    /// List of artists returned by MusicBrainz search requests.
-    /// </summary>
+    // NOTE: for MusicBrainz ws/3 these additional classes might no longer be necessary.
+    //       See https://tickets.metabrainz.org/browse/MBS-9731
+
     [DataContract]
-    public class ArtistList : QueryResult<Artist>
+    class ArtistList
     {
-        /// <summary>
-        /// Gets or sets the list of artists.
-        /// </summary>
+        [DataMember(Name = "count")]
+        public int Count { get; set; }
+
+        [DataMember(Name = "offset")]
+        public int Offset { get; set; }
+
         [DataMember(Name = "artists")]
         public List<Artist> Items { get; set; }
-
-        /// <inheritdoc />
-        public override IEnumerator<Artist> GetEnumerator()
-        {
-            return Items.GetEnumerator();
-        }
     }
 
-    // NOTE: for MusicBrainz ws/3 this additional class might no longer be necessary.
-    //       See https://tickets.metabrainz.org/browse/MBS-9731
-
-    /// <summary>
-    /// List of artists returned by MusicBrainz browse requests.
-    /// </summary>
     [DataContract]
-    internal class ArtistListBrowse
+    class ArtistListBrowse
     {
-        /// <summary>
-        /// Gets or sets the list of artists.
-        /// </summary>
         [DataMember(Name = "artists")]
         public List<Artist> Items { get; set; }
 
-        // NOTE: hide members of the base class to make serialization work
-
-        /// <summary>
-        /// Gets or sets the total list items count.
-        /// </summary>
         [DataMember(Name = "artist-count")]
         public int Count { get; set; }
 
-        /// <summary>
-        /// Gets or sets the list offset.
-        /// </summary>
         [DataMember(Name = "artist-offset")]
         public int Offset { get; set; }
     }
diff --git a/src/Hqub.MusicBrainz/Entities/Collections/LabelList.cs b/src/Hqub.MusicBrainz/Entities/Collections/LabelList.cs
index de7a766..5b09b3d 100644
--- a/src/Hqub.MusicBrainz/Entities/Collections/LabelList.cs
+++ b/src/Hqub.MusicBrainz/Entities/Collections/LabelList.cs
@@ -4,51 +4,28 @@ namespace Hqub.MusicBrainz.Entities.Collections
     using System.Collections.Generic;
     using System.Runtime.Serialization;
 
-    /// <summary>
-    /// List of labels returned by MusicBrainz search requests.
-    /// </summary>
     [DataContract]
-    public class LabelList : QueryResult<Label>
+    class LabelList
     {
-        /// <summary>
-        /// Gets or sets the list of labels.
-        /// </summary>
+        [DataMember(Name = "count")]
+        public int Count { get; set; }
+
+        [DataMember(Name = "offset")]
+        public int Offset { get; set; }
+
         [DataMember(Name = "labels")]
         public List<Label> Items { get; set; }
-
-        /// <inheritdoc />
-        public override IEnumerator<Label> GetEnumerator()
-        {
-            return Items.GetEnumerator();
-        }
     }
 
-    // NOTE: for MusicBrainz ws/3 this additional class might no longer be necessary.
-    //       See https://tickets.metabrainz.org/browse/MBS-9731
-
-    /// <summary>
-    /// List of labels returned by MusicBrainz browse requests.
-    /// </summary>
     [DataContract]
-    internal class LabelListBrowse
+    class LabelListBrowse
     {
-        /// <summary>
-        /// Gets or sets the list of labels.
-        /// </summary>
         [DataMember(Name = "labels")]
         public List<Label> Items { get; set; }
 
-        // NOTE: hide members of the base class to make serialization work
-
-        /// <summary>
-        /// Gets or sets the total list items count.
-        /// </summary>
         [DataMember(Name = "label-count")]
         public int Count { get; set; }
 
-        /// <summary>
-        /// Gets or sets the list offset.
-        /// </summary>
         [DataMember(Name = "label-offset")]
         public int Offset { get; set; }
     }
diff --git a/src/Hqub.MusicBrainz/Entities/Collections/RecordingList.cs b/src/Hqub.MusicBrainz/Entities/Collections/RecordingList.cs
index 0e7d93b..1ad1441 100644
--- a/src/Hqub.MusicBrainz/Entities/Collections/RecordingList.cs
+++ b/src/Hqub.MusicBrainz/Entities/Collections/RecordingList.cs
@@ -4,51 +4,31 @@ namespace Hqub.MusicBrainz.Entities.Collections
     using System.Collections.Generic;
     using System.Runtime.Serialization;
 
-    /// <summary>
-    /// List of recordings returned by MusicBrainz search requests.
-    /// </summary>
     [DataContract]
-    public class RecordingList : QueryResult<Recording>
+    class RecordingList
     {
-        /// <summary>
-        /// Gets or sets the list of artists.
-        /// </summary>
+        [DataMember(Name = "count")]
+        public int Count { get; set; }
+
+        [DataMember(Name = "offset")]
+        public int Offset { get; set; }
+
         [DataMember(Name = "recordings")]
         public List<Recording> Items { get; set; }
-
-        /// <inheritdoc />
-        public override IEnumerator<Recording> GetEnumerator()
-        {
-            return Items.GetEnumerator();
-        }
     }
 
     // NOTE: for MusicBrainz ws/3 this additional class might no longer be necessary.
     //       See https://tickets.metabrainz.org/browse/MBS-9731
 
-    /// <summary>
-    /// List of recordings returned by MusicBrainz browse requests.
-    /// </summary>
     [DataContract]
-    internal class RecordingListBrowse
+    class RecordingListBrowse
     {
-        /// <summary>
-        /// Gets or sets the list of artists.
-        /// </summary>
         [DataMember(Name = "recordings")]
         public List<Recording> Items { get; set; }
 
-        // NOTE: hide members of the base class to make serialization work
-
-        /// <summary>
-        /// Gets or sets the total list items count.
-        /// </summary>
         [DataMember(Name = "recording-count")]
         public int Count { get; set; }
 
-        /// <summary>
-        /// Gets or sets the list offset.
-        /// </summary>
         [DataMember(Name = "recording-offset")]
         public int Offset { get; set; }
     }
diff --git a/src/Hqub.MusicBrainz/Entities/Collections/ReleaseGroupList.cs b/src/Hqub.MusicBrainz/Entities/Collections/ReleaseGroupList.cs
index e66ea20..1924d59 100644
--- a/src/Hqub.MusicBrainz/Entities/Collections/ReleaseGroupList.cs
+++ b/src/Hqub.MusicBrainz/Entities/Collections/ReleaseGroupList.cs
@@ -4,51 +4,28 @@ namespace Hqub.MusicBrainz.Entities.Collections
     using System.Collections.Generic;
     using System.Runtime.Serialization;
 
-    /// <summary>
-    /// List of release-groups returned by MusicBrainz search requests.
-    /// </summary>
     [DataContract]
-    public class ReleaseGroupList : QueryResult<ReleaseGroup>
+    class ReleaseGroupList
     {
-        /// <summary>
-        /// Gets or sets the list of artists.
-        /// </summary>
+        [DataMember(Name = "count")]
+        public int Count { get; set; }
+
+        [DataMember(Name = "offset")]
+        public int Offset { get; set; }
+
         [DataMember(Name = "release-groups")]
         public List<ReleaseGroup> Items { get; set; }
-
-        /// <inheritdoc />
-        public override IEnumerator<ReleaseGroup> GetEnumerator()
-        {
-            return Items.GetEnumerator();
-        }
     }
 
-    // NOTE: for MusicBrainz ws/3 this additional class might no longer be necessary.
-    //       See https://tickets.metabrainz.org/browse/MBS-9731
-
-    /// <summary>
-    /// List of release-groups returned by MusicBrainz browse requests.
-    /// </summary>
     [DataContract]
-    internal class ReleaseGroupListBrowse
+    class ReleaseGroupListBrowse
     {
-        /// <summary>
-        /// Gets or sets the list of artists.
-        /// </summary>
         [DataMember(Name = "release-groups")]
         public List<ReleaseGroup> Items { get; set; }
 
-        // NOTE: hide members of the base class to make serialization work
-
-        /// <summary>
-        /// Gets or sets the total list items count.
-        /// </summary>
         [DataMember(Name = "release-group-count")]
         public int Count { get; set; }
 
-        /// <summary>
-        /// Gets or sets the list offset.
-        /// </summary>
         [DataMember(Name = "release-group-offset")]
         public int Offset { get; set; }
     }
diff --git a/src/Hqub.MusicBrainz/Entities/Collections/ReleaseList.cs b/src/Hqub.MusicBrainz/Entities/Collections/ReleaseList.cs
index b4f632e..cc9fd5a 100644
--- a/src/Hqub.MusicBrainz/Entities/Collections/ReleaseList.cs
+++ b/src/Hqub.MusicBrainz/Entities/Collections/ReleaseList.cs
@@ -4,49 +4,28 @@ namespace Hqub.MusicBrainz.Entities.Collections
     using System.Collections.Generic;
     using System.Runtime.Serialization;
 
-    /// <summary>
-    /// List of releases returned by MusicBrainz search requests.
-    /// </summary>
     [DataContract]
-    public class ReleaseList : QueryResult<Release>
+    class ReleaseList
     {
-        /// <summary>
-        /// Gets or sets the list of artists.
-        /// </summary>
+        [DataMember(Name = "count")]
+        public int Count { get; set; }
+
+        [DataMember(Name = "offset")]
+        public int Offset { get; set; }
+
         [DataMember(Name = "releases")]
         public List<Release> Items { get; set; }
-
-        /// <inheritdoc />
-        public override IEnumerator<Release> GetEnumerator()
-        {
-            return Items.GetEnumerator();
-        }
     }
 
-    // NOTE: for MusicBrainz ws/3 this additional class might no longer be necessary.
-    //       See https://tickets.metabrainz.org/browse/MBS-9731
-
-    /// <summary>
-    /// List of releases returned by MusicBrainz browse requests.
-    /// </summary>
     [DataContract]
-    internal class ReleaseListBrowse
+    class ReleaseListBrowse
     {
-        /// <summary>
-        /// Gets or sets the list of artists.
-        /// </summary>
         [DataMember(Name = "releases")]
         public List<Release> Items { get; set; }
 
-        /// <summary>
-        /// Gets or sets the total list items count.
-        /// </summary>
         [DataMember(Name = "release-count")]
         public int Count { get; set; }
 
-        /// <summary>
-        /// Gets or sets the list offset.
-        /// </summary>
         [DataMember(Name = "release-offset")]
         public int Offset { get; set; }
     }
diff --git a/src/Hqub.MusicBrainz/QueryResult.cs b/src/Hqub.MusicBrainz/QueryResult.cs
index 80d9a8e..f97b863 100644
--- a/src/Hqub.MusicBrainz/QueryResult.cs
+++ b/src/Hqub.MusicBrainz/QueryResult.cs
@@ -1,14 +1,12 @@
 using System.Collections;
 using System.Collections.Generic;
-using System.Runtime.Serialization;
 
 namespace Hqub.MusicBrainz
 {
     /// <summary>
     /// Abstract base class for MusicBrainz queries returning lists (with paging support).
     /// </summary>
-    [DataContract]
-    public abstract class QueryResult<T> : IEnumerable<T>
+    public class QueryResult<T> : IEnumerable<T>
     {
         /// <summary>
         /// Gets or sets the total list items count.
@@ -19,20 +17,27 @@ public abstract class QueryResult<T> : IEnumerable<T>
         /// of available items (on the server), while the number of returned items is
         /// limited by the requests 'limit' parameter (default = 25).
         /// </remarks>
-        [DataMember(Name = "count")]
         public int Count { get; set; }
 
         /// <summary>
         /// Gets or sets the list offset (only available in search requests).
         /// </summary>
-        [DataMember(Name = "offset")]
         public int Offset { get; set; }
 
+        /// <summary>
+        /// Gets or sets the list of entities.
+        /// </summary>
+        public List<T> Items { get; set; }
+
         /// <summary>
         /// Returns an enumerator that iterates through the collection.
         /// </summary>
         /// <returns>An enumerator that can be used to iterate through the collection.</returns>
-        public abstract IEnumerator<T> GetEnumerator();
+        public IEnumerator<T> GetEnumerator()
+        {
+            return Items.GetEnumerator();
+        }
+
 
         IEnumerator IEnumerable.GetEnumerator()
         {
diff --git a/src/Hqub.MusicBrainz/Services/ArtistService.cs b/src/Hqub.MusicBrainz/Services/ArtistService.cs
index e71eff1..e03fd0d 100644
--- a/src/Hqub.MusicBrainz/Services/ArtistService.cs
+++ b/src/Hqub.MusicBrainz/Services/ArtistService.cs
@@ -27,19 +27,19 @@ public LookupRequest<Artist> Get(string id, params string[] inc)
         }
 
         /// <inheritdoc />
-        public SearchRequest<ArtistList> Search(string query, int limit = 25, int offset = 0)
+        public SearchRequest<Artist> Search(string query, int limit = 25, int offset = 0)
         {
-            return new SearchRequest<ArtistList>(client, builder, query, EntityName).Limit(limit).Offset(offset);
+            return new ArtistSearchRequest(client, builder, query, EntityName).Limit(limit).Offset(offset);
         }
 
         /// <inheritdoc />
-        public SearchRequest<ArtistList> Search(QueryParameters<Artist> query, int limit = 25, int offset = 0)
+        public SearchRequest<Artist> Search(QueryParameters<Artist> query, int limit = 25, int offset = 0)
         {
-            return new SearchRequest<ArtistList>(client, builder, query.ToString(), EntityName).Limit(limit).Offset(offset);
+            return new ArtistSearchRequest(client, builder, query.ToString(), EntityName).Limit(limit).Offset(offset);
         }
 
         /// <inheritdoc />
-        public BrowseRequest<ArtistList> Browse(string entity, string id, int limit = 25, int offset = 0, params string[] inc)
+        public BrowseRequest<Artist> Browse(string entity, string id, int limit = 25, int offset = 0, params string[] inc)
         {
             return new ArtistBrowseRequest(client, builder, id, entity, EntityName).Limit(limit).Offset(offset).Include(inc);
         }
@@ -62,7 +62,7 @@ public async Task<Artist> GetAsync(string id, params string[] inc)
         }
 
         /// <inheritdoc />
-        public async Task<ArtistList> SearchAsync(string query, int limit = 25, int offset = 0)
+        public async Task<QueryResult<Artist>> SearchAsync(string query, int limit = 25, int offset = 0)
         {
             if (string.IsNullOrEmpty(query))
             {
@@ -71,23 +71,25 @@ public async Task<ArtistList> SearchAsync(string query, int limit = 25, int offs
 
             string url = builder.CreateSearchUrl(EntityName, query, limit, offset);
 
-            return await client.GetAsync<ArtistList>(url);
+            var list = await client.GetAsync<ArtistList>(url);
+
+            return new QueryResult<Artist>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
         }
 
         /// <inheritdoc />
-        public async Task<ArtistList> SearchAsync(QueryParameters<Artist> query, int limit = 25, int offset = 0)
+        public async Task<QueryResult<Artist>> SearchAsync(QueryParameters<Artist> query, int limit = 25, int offset = 0)
         {
             return await SearchAsync(query.ToString(), limit, offset);
         }
 
         /// <inheritdoc />
-        public async Task<ArtistList> BrowseAsync(string entity, string id, int limit = 25, int offset = 0, params string[] inc)
+        public async Task<QueryResult<Artist>> BrowseAsync(string entity, string id, int limit = 25, int offset = 0, params string[] inc)
         {
             string url = builder.CreateBrowseUrl(EntityName, entity, id, limit, offset, inc);
 
             var list = await client.GetAsync<ArtistListBrowse>(url);
 
-            return new ArtistList() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+            return new QueryResult<Artist>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
         }
 
         #endregion
diff --git a/src/Hqub.MusicBrainz/Services/BrowseRequest.cs b/src/Hqub.MusicBrainz/Services/BrowseRequest.cs
index 858a0ee..8177872 100644
--- a/src/Hqub.MusicBrainz/Services/BrowseRequest.cs
+++ b/src/Hqub.MusicBrainz/Services/BrowseRequest.cs
@@ -1,5 +1,6 @@
 namespace Hqub.MusicBrainz.Services
 {
+    using Hqub.MusicBrainz.Entities;
     using Hqub.MusicBrainz.Entities.Collections;
     using System.Threading;
     using System.Threading.Tasks;
@@ -114,7 +115,7 @@ public BrowseRequest<T> Status(string status)
         /// </summary>
         /// <param name="ct">The cancellation token.</param>
         /// <returns></returns>
-        public async Task<T> GetAsync(CancellationToken ct = default)
+        public async Task<QueryResult<T>> GetAsync(CancellationToken ct = default)
         {
             return await BrowseAsync(client, ct);
         }
@@ -122,7 +123,7 @@ public async Task<T> GetAsync(CancellationToken ct = default)
         /// <summary>
         /// Initiate the actual request.
         /// </summary>
-        protected abstract Task<T> BrowseAsync(MusicBrainzClient client, CancellationToken ct);
+        protected abstract Task<QueryResult<T>> BrowseAsync(MusicBrainzClient client, CancellationToken ct);
 
         /// <summary>
         /// Returns the request path.
@@ -132,7 +133,7 @@ public async Task<T> GetAsync(CancellationToken ct = default)
 
     #region Helper classes
 
-    class ArtistBrowseRequest : BrowseRequest<ArtistList>
+    class ArtistBrowseRequest : BrowseRequest<Artist>
     {
         public ArtistBrowseRequest(MusicBrainzClient client, UrlBuilder builder, string id, string relatedEntity, string entity)
             : base(client, builder, id, relatedEntity, entity)
@@ -140,13 +141,13 @@ public ArtistBrowseRequest(MusicBrainzClient client, UrlBuilder builder, string
         }
 
         /// <inheritdoc />
-        protected override async Task<ArtistList> BrowseAsync(MusicBrainzClient client, CancellationToken ct)
+        protected override async Task<QueryResult<Artist>> BrowseAsync(MusicBrainzClient client, CancellationToken ct)
         {
             string url = builder.CreateBrowseUrl(EntityName, relatedEntity, id, limit, offset, include);
 
             var list = await client.GetAsync<ArtistListBrowse>(url, ct);
 
-            return new ArtistList() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+            return new QueryResult<Artist>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
         }
 
         /// <inheritdoc />
@@ -156,7 +157,7 @@ public override string ToString()
         }
     }
 
-    class LabelBrowseRequest : BrowseRequest<LabelList>
+    class LabelBrowseRequest : BrowseRequest<Label>
     {
         public LabelBrowseRequest(MusicBrainzClient client, UrlBuilder builder, string id, string relatedEntity, string entity)
             : base(client, builder, id, relatedEntity, entity)
@@ -164,13 +165,13 @@ public LabelBrowseRequest(MusicBrainzClient client, UrlBuilder builder, string i
         }
 
         /// <inheritdoc />
-        protected override async Task<LabelList> BrowseAsync(MusicBrainzClient client, CancellationToken ct)
+        protected override async Task<QueryResult<Label>> BrowseAsync(MusicBrainzClient client, CancellationToken ct)
         {
             string url = builder.CreateBrowseUrl(EntityName, relatedEntity, id, limit, offset, include);
 
             var list = await client.GetAsync<LabelListBrowse>(url, ct);
 
-            return new LabelList() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+            return new QueryResult<Label>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
         }
 
         /// <inheritdoc />
@@ -180,7 +181,7 @@ public override string ToString()
         }
     }
 
-    class RecordingBrowseRequest : BrowseRequest<RecordingList>
+    class RecordingBrowseRequest : BrowseRequest<Recording>
     {
         public RecordingBrowseRequest(MusicBrainzClient client, UrlBuilder builder, string id, string relatedEntity, string entity)
             : base(client, builder, id, relatedEntity, entity)
@@ -188,13 +189,13 @@ public RecordingBrowseRequest(MusicBrainzClient client, UrlBuilder builder, stri
         }
 
         /// <inheritdoc />
-        protected override async Task<RecordingList> BrowseAsync(MusicBrainzClient client, CancellationToken ct)
+        protected override async Task<QueryResult<Recording>> BrowseAsync(MusicBrainzClient client, CancellationToken ct)
         {
             string url = builder.CreateBrowseUrl(EntityName, relatedEntity, id, limit, offset, include);
 
             var list = await client.GetAsync<RecordingListBrowse>(url, ct);
 
-            return new RecordingList() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+            return new QueryResult<Recording>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
         }
 
         /// <inheritdoc />
@@ -204,7 +205,7 @@ public override string ToString()
         }
     }
 
-    class ReleaseGroupBrowseRequest : BrowseRequest<ReleaseGroupList>
+    class ReleaseGroupBrowseRequest : BrowseRequest<ReleaseGroup>
     {
         public ReleaseGroupBrowseRequest(MusicBrainzClient client, UrlBuilder builder, string id, string relatedEntity, string entity)
             : base(client, builder, id, relatedEntity, entity)
@@ -212,13 +213,13 @@ public ReleaseGroupBrowseRequest(MusicBrainzClient client, UrlBuilder builder, s
         }
 
         /// <inheritdoc />
-        protected override async Task<ReleaseGroupList> BrowseAsync(MusicBrainzClient client, CancellationToken ct)
+        protected override async Task<QueryResult<ReleaseGroup>> BrowseAsync(MusicBrainzClient client, CancellationToken ct)
         {
             string url = builder.CreateBrowseUrl(EntityName, relatedEntity, id, type, null, limit, offset, include);
 
             var list = await client.GetAsync<ReleaseGroupListBrowse>(url, ct);
 
-            return new ReleaseGroupList() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+            return new QueryResult<ReleaseGroup>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
         }
 
         /// <inheritdoc />
@@ -228,7 +229,7 @@ public override string ToString()
         }
     }
 
-    class ReleaseBrowseRequest : BrowseRequest<ReleaseList>
+    class ReleaseBrowseRequest : BrowseRequest<Release>
     {
         public ReleaseBrowseRequest(MusicBrainzClient client, UrlBuilder builder, string id, string relatedEntity, string entity)
             : base(client, builder, id, relatedEntity, entity)
@@ -236,13 +237,13 @@ public ReleaseBrowseRequest(MusicBrainzClient client, UrlBuilder builder, string
         }
 
         /// <inheritdoc />
-        protected override async Task<ReleaseList> BrowseAsync(MusicBrainzClient client, CancellationToken ct)
+        protected override async Task<QueryResult<Release>> BrowseAsync(MusicBrainzClient client, CancellationToken ct)
         {
             string url = builder.CreateBrowseUrl(EntityName, relatedEntity, id, type, status, limit, offset, include);
 
             var list = await client.GetAsync<ReleaseListBrowse>(url, ct);
 
-            return new ReleaseList() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+            return new QueryResult<Release>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
         }
 
         /// <inheritdoc />
diff --git a/src/Hqub.MusicBrainz/Services/IArtistService.cs b/src/Hqub.MusicBrainz/Services/IArtistService.cs
index 71503c4..3c6ac58 100644
--- a/src/Hqub.MusicBrainz/Services/IArtistService.cs
+++ b/src/Hqub.MusicBrainz/Services/IArtistService.cs
@@ -1,7 +1,6 @@
 namespace Hqub.MusicBrainz.Services
 {
     using Hqub.MusicBrainz.Entities;
-    using Hqub.MusicBrainz.Entities.Collections;
     using System.Threading.Tasks;
 
     /// <summary>
@@ -24,7 +23,7 @@ public interface IArtistService
         /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
         /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
         /// <returns></returns>
-        SearchRequest<ArtistList> Search(string query, int limit = 25, int offset = 0);
+        SearchRequest<Artist> Search(string query, int limit = 25, int offset = 0);
 
         /// <summary>
         /// Create a request to search for an artist in the MusicBrainz database, matching the given query.
@@ -33,7 +32,7 @@ public interface IArtistService
         /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
         /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
         /// <returns></returns>
-        SearchRequest<ArtistList> Search(QueryParameters<Artist> query, int limit = 25, int offset = 0);
+        SearchRequest<Artist> Search(QueryParameters<Artist> query, int limit = 25, int offset = 0);
 
         /// <summary>
         /// Create a request to browse all artists in the MusicBrainz database, which are linked to the entity with given id.
@@ -44,7 +43,7 @@ public interface IArtistService
         /// <param name="offset">Return results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
         /// <param name="inc">A list of entities to include (sub-queries).</param>
         /// <returns></returns>
-        BrowseRequest<ArtistList> Browse(string entity, string id, int limit = 25, int offset = 0, params string[] inc);
+        BrowseRequest<Artist> Browse(string entity, string id, int limit = 25, int offset = 0, params string[] inc);
 
         /// <summary>
         /// Lookup an artist in the MusicBrainz database.
@@ -61,7 +60,7 @@ public interface IArtistService
         /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
         /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
         /// <returns></returns>
-        Task<ArtistList> SearchAsync(string query, int limit = 25, int offset = 0);
+        Task<QueryResult<Artist>> SearchAsync(string query, int limit = 25, int offset = 0);
 
         /// <summary>
         /// Search for an artist in the MusicBrainz database, matching the given query.
@@ -70,7 +69,7 @@ public interface IArtistService
         /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
         /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
         /// <returns></returns>
-        Task<ArtistList> SearchAsync(QueryParameters<Artist> query, int limit = 25, int offset = 0);
+        Task<QueryResult<Artist>> SearchAsync(QueryParameters<Artist> query, int limit = 25, int offset = 0);
 
         /// <summary>
         /// Browse all artists in the MusicBrainz database, which are linked to the entity with given id.
@@ -81,6 +80,6 @@ public interface IArtistService
         /// <param name="offset">Return results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
         /// <param name="inc">A list of entities to include (sub-queries).</param>
         /// <returns></returns>
-        Task<ArtistList> BrowseAsync(string entity, string id, int limit = 25, int offset = 0, params string[] inc);
+        Task<QueryResult<Artist>> BrowseAsync(string entity, string id, int limit = 25, int offset = 0, params string[] inc);
     }
 }
diff --git a/src/Hqub.MusicBrainz/Services/ILabelService.cs b/src/Hqub.MusicBrainz/Services/ILabelService.cs
index 7ff33fc..1b69296 100644
--- a/src/Hqub.MusicBrainz/Services/ILabelService.cs
+++ b/src/Hqub.MusicBrainz/Services/ILabelService.cs
@@ -1,7 +1,6 @@
 namespace Hqub.MusicBrainz.Services
 {
     using Hqub.MusicBrainz.Entities;
-    using Hqub.MusicBrainz.Entities.Collections;
     using System.Threading.Tasks;
 
     /// <summary>
@@ -24,7 +23,7 @@ public interface ILabelService
         /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
         /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
         /// <returns></returns>
-        SearchRequest<LabelList> Search(string query, int limit = 25, int offset = 0);
+        SearchRequest<Label> Search(string query, int limit = 25, int offset = 0);
 
         /// <summary>
         /// Create a request to search for a label in the MusicBrainz database, matching the given query.
@@ -33,7 +32,7 @@ public interface ILabelService
         /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
         /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
         /// <returns></returns>
-        SearchRequest<LabelList> Search(QueryParameters<Label> query, int limit = 25, int offset = 0);
+        SearchRequest<Label> Search(QueryParameters<Label> query, int limit = 25, int offset = 0);
 
         /// <summary>
         /// Create a request to browse all labels in the MusicBrainz database, which are linked to the entity with given id.
@@ -44,7 +43,7 @@ public interface ILabelService
         /// <param name="offset">Return results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
         /// <param name="inc">A list of entities to include (sub-queries).</param>
         /// <returns></returns>
-        BrowseRequest<LabelList> Browse(string entity, string id, int limit = 25, int offset = 0, params string[] inc);
+        BrowseRequest<Label> Browse(string entity, string id, int limit = 25, int offset = 0, params string[] inc);
 
         /// <summary>
         /// Lookup a label in the MusicBrainz database.
@@ -61,7 +60,7 @@ public interface ILabelService
         /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
         /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
         /// <returns></returns>
-        Task<LabelList> SearchAsync(string query, int limit = 25, int offset = 0);
+        Task<QueryResult<Label>> SearchAsync(string query, int limit = 25, int offset = 0);
 
         /// <summary>
         /// Search for a label in the MusicBrainz database, matching the given query.
@@ -70,7 +69,7 @@ public interface ILabelService
         /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
         /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
         /// <returns></returns>
-        Task<LabelList> SearchAsync(QueryParameters<Label> query, int limit = 25, int offset = 0);
+        Task<QueryResult<Label>> SearchAsync(QueryParameters<Label> query, int limit = 25, int offset = 0);
 
         /// <summary>
         /// Browse all labels in the MusicBrainz database, which are linked to the entity with given id.
@@ -81,6 +80,6 @@ public interface ILabelService
         /// <param name="offset">Return results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
         /// <param name="inc">A list of entities to include (sub-queries).</param>
         /// <returns></returns>
-        Task<LabelList> BrowseAsync(string entity, string id, int limit = 25, int offset = 0, params string[] inc);
+        Task<QueryResult<Label>> BrowseAsync(string entity, string id, int limit = 25, int offset = 0, params string[] inc);
     }
 }
diff --git a/src/Hqub.MusicBrainz/Services/IRecordingService.cs b/src/Hqub.MusicBrainz/Services/IRecordingService.cs
index 1cecc77..5cffe07 100644
--- a/src/Hqub.MusicBrainz/Services/IRecordingService.cs
+++ b/src/Hqub.MusicBrainz/Services/IRecordingService.cs
@@ -1,7 +1,6 @@
 namespace Hqub.MusicBrainz.Services
 {
     using Hqub.MusicBrainz.Entities;
-    using Hqub.MusicBrainz.Entities.Collections;
     using System.Threading.Tasks;
 
     /// <summary>
@@ -24,7 +23,7 @@ public interface IRecordingService
         /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
         /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
         /// <returns></returns>
-        SearchRequest<RecordingList> Search(string query, int limit = 25, int offset = 0);
+        SearchRequest<Recording> Search(string query, int limit = 25, int offset = 0);
 
         /// <summary>
         /// Create a request to search for a recording in the MusicBrainz database, matching the given query.
@@ -33,7 +32,7 @@ public interface IRecordingService
         /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
         /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
         /// <returns></returns>
-        SearchRequest<RecordingList> Search(QueryParameters<Artist> query, int limit = 25, int offset = 0);
+        SearchRequest<Recording> Search(QueryParameters<Recording> query, int limit = 25, int offset = 0);
 
         /// <summary>
         /// Create a request to browse all recordings in the MusicBrainz database, which are linked to the entity with given id.
@@ -44,7 +43,7 @@ public interface IRecordingService
         /// <param name="offset">Return results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
         /// <param name="inc">A list of entities to include (sub-queries).</param>
         /// <returns></returns>
-        BrowseRequest<RecordingList> Browse(string entity, string id, int limit = 25, int offset = 0, params string[] inc);
+        BrowseRequest<Recording> Browse(string entity, string id, int limit = 25, int offset = 0, params string[] inc);
 
         /// <summary>
         /// Lookup a recording in the MusicBrainz database.
@@ -61,7 +60,7 @@ public interface IRecordingService
         /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
         /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
         /// <returns></returns>
-        Task<RecordingList> SearchAsync(string query, int limit = 25, int offset = 0);
+        Task<QueryResult<Recording>> SearchAsync(string query, int limit = 25, int offset = 0);
 
         /// <summary>
         /// Search for a recording in the MusicBrainz database, matching the given query.
@@ -70,7 +69,7 @@ public interface IRecordingService
         /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
         /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
         /// <returns></returns>
-        Task<RecordingList> SearchAsync(QueryParameters<Recording> query, int limit = 25, int offset = 0);
+        Task<QueryResult<Recording>> SearchAsync(QueryParameters<Recording> query, int limit = 25, int offset = 0);
 
         /// <summary>
         /// Browse all recordings in the MusicBrainz database, which are linked to the entity with given id.
@@ -81,6 +80,6 @@ public interface IRecordingService
         /// <param name="offset">Return results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
         /// <param name="inc">A list of entities to include (sub-queries).</param>
         /// <returns></returns>
-        Task<RecordingList> BrowseAsync(string entity, string id, int limit = 25, int offset = 0, params string[] inc);
+        Task<QueryResult<Recording>> BrowseAsync(string entity, string id, int limit = 25, int offset = 0, params string[] inc);
     }
 }
diff --git a/src/Hqub.MusicBrainz/Services/IReleaseGroupService.cs b/src/Hqub.MusicBrainz/Services/IReleaseGroupService.cs
index 9e23f53..35923e1 100644
--- a/src/Hqub.MusicBrainz/Services/IReleaseGroupService.cs
+++ b/src/Hqub.MusicBrainz/Services/IReleaseGroupService.cs
@@ -1,7 +1,6 @@
 namespace Hqub.MusicBrainz.Services
 {
     using Hqub.MusicBrainz.Entities;
-    using Hqub.MusicBrainz.Entities.Collections;
     using System.Threading.Tasks;
 
     /// <summary>
@@ -24,7 +23,7 @@ public interface IReleaseGroupService
         /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
         /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
         /// <returns></returns>
-        SearchRequest<ReleaseGroupList> Search(string query, int limit = 25, int offset = 0);
+        SearchRequest<ReleaseGroup> Search(string query, int limit = 25, int offset = 0);
 
         /// <summary>
         /// Create a request to search for a release-group in the MusicBrainz database, matching the given query.
@@ -33,7 +32,7 @@ public interface IReleaseGroupService
         /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
         /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
         /// <returns></returns>
-        SearchRequest<ReleaseGroupList> Search(QueryParameters<Artist> query, int limit = 25, int offset = 0);
+        SearchRequest<ReleaseGroup> Search(QueryParameters<ReleaseGroup> query, int limit = 25, int offset = 0);
 
         /// <summary>
         /// Create a request to browse all release-groups in the MusicBrainz database, which are linked to the entity with given id.
@@ -44,7 +43,7 @@ public interface IReleaseGroupService
         /// <param name="offset">Return results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
         /// <param name="inc">A list of entities to include (sub-queries).</param>
         /// <returns></returns>
-        BrowseRequest<ReleaseGroupList> Browse(string entity, string id, int limit = 25, int offset = 0, params string[] inc);
+        BrowseRequest<ReleaseGroup> Browse(string entity, string id, int limit = 25, int offset = 0, params string[] inc);
 
         /// <summary>
         /// Lookup a release-group in the MusicBrainz database.
@@ -61,7 +60,7 @@ public interface IReleaseGroupService
         /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
         /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
         /// <returns></returns>
-        Task<ReleaseGroupList> SearchAsync(string query, int limit = 25, int offset = 0);
+        Task<QueryResult<ReleaseGroup>> SearchAsync(string query, int limit = 25, int offset = 0);
 
         /// <summary>
         /// Search for a release-group in the MusicBrainz database, matching the given query.
@@ -70,7 +69,7 @@ public interface IReleaseGroupService
         /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
         /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
         /// <returns></returns>
-        Task<ReleaseGroupList> SearchAsync(QueryParameters<ReleaseGroup> query, int limit = 25, int offset = 0);
+        Task<QueryResult<ReleaseGroup>> SearchAsync(QueryParameters<ReleaseGroup> query, int limit = 25, int offset = 0);
 
         /// <summary>
         /// Browse all release-groups in the MusicBrainz database, which are linked to the entity with given id.
@@ -81,7 +80,7 @@ public interface IReleaseGroupService
         /// <param name="offset">Return results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
         /// <param name="inc">A list of entities to include (sub-queries).</param>
         /// <returns></returns>
-        Task<ReleaseGroupList> BrowseAsync(string entity, string id, int limit = 25, int offset = 0, params string[] inc);
+        Task<QueryResult<ReleaseGroup>> BrowseAsync(string entity, string id, int limit = 25, int offset = 0, params string[] inc);
 
         /// <summary>
         /// Browse all release-groups in the MusicBrainz database, which are linked to the entity with given id.
@@ -96,6 +95,6 @@ public interface IReleaseGroupService
         /// <remarks>
         /// See https://musicbrainz.org/doc/Development/XML_Web_Service/Version_2#Release_Type_and_Status for supported values of type.
         /// </remarks>
-        Task<ReleaseGroupList> BrowseAsync(string entity, string id, string type, int limit = 25, int offset = 0, params string[] inc);
+        Task<QueryResult<ReleaseGroup>> BrowseAsync(string entity, string id, string type, int limit = 25, int offset = 0, params string[] inc);
     }
 }
diff --git a/src/Hqub.MusicBrainz/Services/IReleaseService.cs b/src/Hqub.MusicBrainz/Services/IReleaseService.cs
index f041076..be8a43b 100644
--- a/src/Hqub.MusicBrainz/Services/IReleaseService.cs
+++ b/src/Hqub.MusicBrainz/Services/IReleaseService.cs
@@ -1,7 +1,6 @@
 namespace Hqub.MusicBrainz.Services
 {
     using Hqub.MusicBrainz.Entities;
-    using Hqub.MusicBrainz.Entities.Collections;
     using System.Threading.Tasks;
 
     /// <summary>
@@ -24,7 +23,7 @@ public interface IReleaseService
         /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
         /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
         /// <returns></returns>
-        SearchRequest<ReleaseList> Search(string query, int limit = 25, int offset = 0);
+        SearchRequest<Release> Search(string query, int limit = 25, int offset = 0);
 
         /// <summary>
         /// Create a request to search for a release in the MusicBrainz database, matching the given query.
@@ -33,7 +32,7 @@ public interface IReleaseService
         /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
         /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
         /// <returns></returns>
-        SearchRequest<ReleaseList> Search(QueryParameters<Artist> query, int limit = 25, int offset = 0);
+        SearchRequest<Release> Search(QueryParameters<Release> query, int limit = 25, int offset = 0);
 
         /// <summary>
         /// Create a request to browse all releases in the MusicBrainz database, which are linked to the entity with given id.
@@ -44,7 +43,7 @@ public interface IReleaseService
         /// <param name="offset">Return results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
         /// <param name="inc">A list of entities to include (sub-queries).</param>
         /// <returns></returns>
-        BrowseRequest<ReleaseList> Browse(string entity, string id, int limit = 25, int offset = 0, params string[] inc);
+        BrowseRequest<Release> Browse(string entity, string id, int limit = 25, int offset = 0, params string[] inc);
 
         /// <summary>
         /// Lookup a release in the MusicBrainz database.
@@ -61,7 +60,7 @@ public interface IReleaseService
         /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
         /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
         /// <returns></returns>
-        Task<ReleaseList> SearchAsync(string query, int limit = 25, int offset = 0);
+        Task<QueryResult<Release>> SearchAsync(string query, int limit = 25, int offset = 0);
 
         /// <summary>
         /// Search for a release in the MusicBrainz database, matching the given query.
@@ -70,7 +69,7 @@ public interface IReleaseService
         /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
         /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
         /// <returns></returns>
-        Task<ReleaseList> SearchAsync(QueryParameters<Release> query, int limit = 25, int offset = 0);
+        Task<QueryResult<Release>> SearchAsync(QueryParameters<Release> query, int limit = 25, int offset = 0);
 
         /// <summary>
         /// Browse all releases in the MusicBrainz database, which are linked to the entity with given id.
@@ -81,7 +80,7 @@ public interface IReleaseService
         /// <param name="offset">Return results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
         /// <param name="inc">A list of entities to include (sub-queries).</param>
         /// <returns></returns>
-        Task<ReleaseList> BrowseAsync(string entity, string id, int limit = 25,
+        Task<QueryResult<Release>> BrowseAsync(string entity, string id, int limit = 25,
             int offset = 0, params string[] inc);
 
         /// <summary>
@@ -98,7 +97,7 @@ Task<ReleaseList> BrowseAsync(string entity, string id, int limit = 25,
         /// <remarks>
         /// See https://musicbrainz.org/doc/Development/XML_Web_Service/Version_2#Release_Type_and_Status for supported values of type and status.
         /// </remarks>
-        Task<ReleaseList> BrowseAsync(string entity, string id, string type, string status = null, int limit = 25,
+        Task<QueryResult<Release>> BrowseAsync(string entity, string id, string type, string status = null, int limit = 25,
             int offset = 0, params string[] inc);
     }
 }
diff --git a/src/Hqub.MusicBrainz/Services/LabelService.cs b/src/Hqub.MusicBrainz/Services/LabelService.cs
index e6fbf3e..baee614 100644
--- a/src/Hqub.MusicBrainz/Services/LabelService.cs
+++ b/src/Hqub.MusicBrainz/Services/LabelService.cs
@@ -27,19 +27,19 @@ public LookupRequest<Label> Get(string id, params string[] inc)
         }
 
         /// <inheritdoc />
-        public SearchRequest<LabelList> Search(string query, int limit = 25, int offset = 0)
+        public SearchRequest<Label> Search(string query, int limit = 25, int offset = 0)
         {
-            return new SearchRequest<LabelList>(client, builder, query, EntityName).Limit(limit).Offset(offset);
+            return new LabelSearchRequest(client, builder, query, EntityName).Limit(limit).Offset(offset);
         }
 
         /// <inheritdoc />
-        public SearchRequest<LabelList> Search(QueryParameters<Label> query, int limit = 25, int offset = 0)
+        public SearchRequest<Label> Search(QueryParameters<Label> query, int limit = 25, int offset = 0)
         {
-            return new SearchRequest<LabelList>(client, builder, query.ToString(), EntityName).Limit(limit).Offset(offset);
+            return new LabelSearchRequest(client, builder, query.ToString(), EntityName).Limit(limit).Offset(offset);
         }
 
         /// <inheritdoc />
-        public BrowseRequest<LabelList> Browse(string entity, string id, int limit = 25, int offset = 0, params string[] inc)
+        public BrowseRequest<Label> Browse(string entity, string id, int limit = 25, int offset = 0, params string[] inc)
         {
             return new LabelBrowseRequest(client, builder, id, entity, EntityName).Limit(limit).Offset(offset).Include(inc);
         }
@@ -62,7 +62,7 @@ public async Task<Label> GetAsync(string id, params string[] inc)
         }
 
         /// <inheritdoc />
-        public async Task<LabelList> SearchAsync(string query, int limit = 25, int offset = 0)
+        public async Task<QueryResult<Label>> SearchAsync(string query, int limit = 25, int offset = 0)
         {
             if (string.IsNullOrEmpty(query))
             {
@@ -71,23 +71,25 @@ public async Task<LabelList> SearchAsync(string query, int limit = 25, int offse
 
             string url = builder.CreateSearchUrl(EntityName, query, limit, offset);
 
-            return await client.GetAsync<LabelList>(url);
+            var list = await client.GetAsync<LabelList>(url);
+
+            return new QueryResult<Label>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
         }
 
         /// <inheritdoc />
-        public async Task<LabelList> SearchAsync(QueryParameters<Label> query, int limit = 25, int offset = 0)
+        public async Task<QueryResult<Label>> SearchAsync(QueryParameters<Label> query, int limit = 25, int offset = 0)
         {
             return await SearchAsync(query.ToString(), limit, offset);
         }
 
         /// <inheritdoc />
-        public async Task<LabelList> BrowseAsync(string entity, string id, int limit = 25, int offset = 0, params string[] inc)
+        public async Task<QueryResult<Label>> BrowseAsync(string entity, string id, int limit = 25, int offset = 0, params string[] inc)
         {
             string url = builder.CreateBrowseUrl(EntityName, entity, id, limit, offset, inc);
 
             var list = await client.GetAsync<LabelListBrowse>(url);
 
-            return new LabelList() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+            return new QueryResult<Label>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
         }
 
         #endregion
diff --git a/src/Hqub.MusicBrainz/Services/RecordingService.cs b/src/Hqub.MusicBrainz/Services/RecordingService.cs
index 45a4c3c..c08b7e1 100644
--- a/src/Hqub.MusicBrainz/Services/RecordingService.cs
+++ b/src/Hqub.MusicBrainz/Services/RecordingService.cs
@@ -27,19 +27,19 @@ public LookupRequest<Recording> Get(string id, params string[] inc)
         }
 
         /// <inheritdoc />
-        public SearchRequest<RecordingList> Search(string query, int limit = 25, int offset = 0)
+        public SearchRequest<Recording> Search(string query, int limit = 25, int offset = 0)
         {
-            return new SearchRequest<RecordingList>(client, builder, query, EntityName).Limit(limit).Offset(offset);
+            return new RecordingSearchRequest(client, builder, query, EntityName).Limit(limit).Offset(offset);
         }
 
         /// <inheritdoc />
-        public SearchRequest<RecordingList> Search(QueryParameters<Artist> query, int limit = 25, int offset = 0)
+        public SearchRequest<Recording> Search(QueryParameters<Recording> query, int limit = 25, int offset = 0)
         {
-            return new SearchRequest<RecordingList>(client, builder, query.ToString(), EntityName).Limit(limit).Offset(offset);
+            return new RecordingSearchRequest(client, builder, query.ToString(), EntityName).Limit(limit).Offset(offset);
         }
 
         /// <inheritdoc />
-        public BrowseRequest<RecordingList> Browse(string entity, string id, int limit = 25, int offset = 0, params string[] inc)
+        public BrowseRequest<Recording> Browse(string entity, string id, int limit = 25, int offset = 0, params string[] inc)
         {
             return new RecordingBrowseRequest(client, builder, id, entity, EntityName).Limit(limit).Offset(offset).Include(inc);
         }
@@ -62,7 +62,7 @@ public async Task<Recording> GetAsync(string id, params string[] inc)
         }
 
         /// <inheritdoc />
-        public async Task<RecordingList> SearchAsync(string query, int limit = 25, int offset = 0)
+        public async Task<QueryResult<Recording>> SearchAsync(string query, int limit = 25, int offset = 0)
         {
             if (string.IsNullOrEmpty(query))
             {
@@ -71,23 +71,25 @@ public async Task<RecordingList> SearchAsync(string query, int limit = 25, int o
 
             string url = builder.CreateSearchUrl(EntityName, query, limit, offset);
 
-            return await client.GetAsync<RecordingList>(url);
+            var list = await client.GetAsync<RecordingList>(url);
+
+            return new QueryResult<Recording>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
         }
 
         /// <inheritdoc />
-        public async Task<RecordingList> SearchAsync(QueryParameters<Recording> query, int limit = 25, int offset = 0)
+        public async Task<QueryResult<Recording>> SearchAsync(QueryParameters<Recording> query, int limit = 25, int offset = 0)
         {
             return await SearchAsync(query.ToString(), limit, offset);
         }
 
         /// <inheritdoc />
-        public async Task<RecordingList> BrowseAsync(string entity, string id, int limit = 25, int offset = 0, params string[] inc)
+        public async Task<QueryResult<Recording>> BrowseAsync(string entity, string id, int limit = 25, int offset = 0, params string[] inc)
         {
             string url = builder.CreateBrowseUrl(EntityName, entity, id, limit, offset, inc);
 
             var list = await client.GetAsync<RecordingListBrowse>(url);
 
-            return new RecordingList() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+            return new QueryResult<Recording>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
         }
 
         #endregion
diff --git a/src/Hqub.MusicBrainz/Services/ReleaseGroupService.cs b/src/Hqub.MusicBrainz/Services/ReleaseGroupService.cs
index 3a53fc4..2ed4f2f 100644
--- a/src/Hqub.MusicBrainz/Services/ReleaseGroupService.cs
+++ b/src/Hqub.MusicBrainz/Services/ReleaseGroupService.cs
@@ -27,19 +27,19 @@ public LookupRequest<ReleaseGroup> Get(string id, params string[] inc)
         }
 
         /// <inheritdoc />
-        public SearchRequest<ReleaseGroupList> Search(string query, int limit = 25, int offset = 0)
+        public SearchRequest<ReleaseGroup> Search(string query, int limit = 25, int offset = 0)
         {
-            return new SearchRequest<ReleaseGroupList>(client, builder, query, EntityName).Limit(limit).Offset(offset);
+            return new ReleaseGroupSearchRequest(client, builder, query, EntityName).Limit(limit).Offset(offset);
         }
 
         /// <inheritdoc />
-        public SearchRequest<ReleaseGroupList> Search(QueryParameters<Artist> query, int limit = 25, int offset = 0)
+        public SearchRequest<ReleaseGroup> Search(QueryParameters<ReleaseGroup> query, int limit = 25, int offset = 0)
         {
-            return new SearchRequest<ReleaseGroupList>(client, builder, query.ToString(), EntityName).Limit(limit).Offset(offset);
+            return new ReleaseGroupSearchRequest(client, builder, query.ToString(), EntityName).Limit(limit).Offset(offset);
         }
 
         /// <inheritdoc />
-        public BrowseRequest<ReleaseGroupList> Browse(string entity, string id, int limit = 25, int offset = 0, params string[] inc)
+        public BrowseRequest<ReleaseGroup> Browse(string entity, string id, int limit = 25, int offset = 0, params string[] inc)
         {
             return new ReleaseGroupBrowseRequest(client, builder, id, entity, EntityName).Limit(limit).Offset(offset).Include(inc);
         }
@@ -62,7 +62,7 @@ public async Task<ReleaseGroup> GetAsync(string id, params string[] inc)
         }
 
         /// <inheritdoc />
-        public async Task<ReleaseGroupList> SearchAsync(string query, int limit = 25, int offset = 0)
+        public async Task<QueryResult<ReleaseGroup>> SearchAsync(string query, int limit = 25, int offset = 0)
         {
             if (string.IsNullOrEmpty(query))
             {
@@ -71,33 +71,35 @@ public async Task<ReleaseGroupList> SearchAsync(string query, int limit = 25, in
 
             string url = builder.CreateSearchUrl(EntityName, query, limit, offset);
 
-            return await client.GetAsync<ReleaseGroupList>(url);
+            var list = await client.GetAsync<ReleaseGroupList>(url);
+
+            return new QueryResult<ReleaseGroup>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
         }
 
         /// <inheritdoc />
-        public async Task<ReleaseGroupList> SearchAsync(QueryParameters<ReleaseGroup> query, int limit = 25, int offset = 0)
+        public async Task<QueryResult<ReleaseGroup>> SearchAsync(QueryParameters<ReleaseGroup> query, int limit = 25, int offset = 0)
         {
             return await SearchAsync(query.ToString(), limit, offset);
         }
 
         /// <inheritdoc />
-        public async Task<ReleaseGroupList> BrowseAsync(string entity, string id, int limit = 25, int offset = 0, params string[] inc)
+        public async Task<QueryResult<ReleaseGroup>> BrowseAsync(string entity, string id, int limit = 25, int offset = 0, params string[] inc)
         {
             string url = builder.CreateBrowseUrl(EntityName, entity, id, limit, offset, inc);
 
             var list = await client.GetAsync<ReleaseGroupListBrowse>(url);
 
-            return new ReleaseGroupList() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+            return new QueryResult<ReleaseGroup>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
         }
 
         /// <inheritdoc />
-        public async Task<ReleaseGroupList> BrowseAsync(string entity, string id, string type, int limit = 25, int offset = 0, params string[] inc)
+        public async Task<QueryResult<ReleaseGroup>> BrowseAsync(string entity, string id, string type, int limit = 25, int offset = 0, params string[] inc)
         {
             string url = builder.CreateBrowseUrl(EntityName, entity, id, type, null, limit, offset, inc);
 
             var list = await client.GetAsync<ReleaseGroupListBrowse>(url);
 
-            return new ReleaseGroupList() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+            return new QueryResult<ReleaseGroup>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
         }
 
         #endregion
diff --git a/src/Hqub.MusicBrainz/Services/ReleaseService.cs b/src/Hqub.MusicBrainz/Services/ReleaseService.cs
index 7ffb135..7f656cc 100644
--- a/src/Hqub.MusicBrainz/Services/ReleaseService.cs
+++ b/src/Hqub.MusicBrainz/Services/ReleaseService.cs
@@ -27,19 +27,19 @@ public LookupRequest<Release> Get(string id, params string[] inc)
         }
 
         /// <inheritdoc />
-        public SearchRequest<ReleaseList> Search(string query, int limit = 25, int offset = 0)
+        public SearchRequest<Release> Search(string query, int limit = 25, int offset = 0)
         {
-            return new SearchRequest<ReleaseList>(client, builder, query, EntityName).Limit(limit).Offset(offset);
+            return new ReleaseSearchRequest(client, builder, query, EntityName).Limit(limit).Offset(offset);
         }
 
         /// <inheritdoc />
-        public SearchRequest<ReleaseList> Search(QueryParameters<Artist> query, int limit = 25, int offset = 0)
+        public SearchRequest<Release> Search(QueryParameters<Release> query, int limit = 25, int offset = 0)
         {
-            return new SearchRequest<ReleaseList>(client, builder, query.ToString(), EntityName).Limit(limit).Offset(offset);
+            return new ReleaseSearchRequest(client, builder, query.ToString(), EntityName).Limit(limit).Offset(offset);
         }
 
         /// <inheritdoc />
-        public BrowseRequest<ReleaseList> Browse(string entity, string id, int limit = 25, int offset = 0, params string[] inc)
+        public BrowseRequest<Release> Browse(string entity, string id, int limit = 25, int offset = 0, params string[] inc)
         {
             return new ReleaseBrowseRequest(client, builder, id, entity, EntityName).Limit(limit).Offset(offset).Include(inc);
         }
@@ -62,7 +62,7 @@ public async Task<Release> GetAsync(string id, params string[] inc)
         }
 
         /// <inheritdoc />
-        public async Task<ReleaseList> SearchAsync(string query, int limit = 25, int offset = 0)
+        public async Task<QueryResult<Release>> SearchAsync(string query, int limit = 25, int offset = 0)
         {
             if (string.IsNullOrEmpty(query))
             {
@@ -71,34 +71,36 @@ public async Task<ReleaseList> SearchAsync(string query, int limit = 25, int off
 
             string url = builder.CreateSearchUrl(EntityName, query, limit, offset);
 
-            return await client.GetAsync<ReleaseList>(url);
+            var list = await client.GetAsync<ReleaseList>(url);
+
+            return new QueryResult<Release>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
         }
 
         /// <inheritdoc />
-        public async Task<ReleaseList> SearchAsync(QueryParameters<Release> query, int limit = 25, int offset = 0)
+        public async Task<QueryResult<Release>> SearchAsync(QueryParameters<Release> query, int limit = 25, int offset = 0)
         {
             return await SearchAsync(query.ToString(), limit, offset);
         }
 
         /// <inheritdoc />
-        public async Task<ReleaseList> BrowseAsync(string entity, string id, int limit = 25,
+        public async Task<QueryResult<Release>> BrowseAsync(string entity, string id, int limit = 25,
             int offset = 0, params string[] inc)
         {
             string url = builder.CreateBrowseUrl(EntityName, entity, id, limit, offset, inc);
 
             var list = await client.GetAsync<ReleaseListBrowse>(url);
 
-            return new ReleaseList() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+            return new QueryResult<Release>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
         }
 
         /// <inheritdoc />
-        public async Task<ReleaseList> BrowseAsync(string entity, string id, string type, string status = null, int limit = 25, int offset = 0, params string[] inc)
+        public async Task<QueryResult<Release>> BrowseAsync(string entity, string id, string type, string status = null, int limit = 25, int offset = 0, params string[] inc)
         {
             string url = builder.CreateBrowseUrl(EntityName, entity, id, type, status, limit, offset, inc);
 
             var list = await client.GetAsync<ReleaseListBrowse>(url);
 
-            return new ReleaseList() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+            return new QueryResult<Release>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
         }
 
         #endregion
diff --git a/src/Hqub.MusicBrainz/Services/SearchRequest.cs b/src/Hqub.MusicBrainz/Services/SearchRequest.cs
index cfbb3b6..e7f9887 100644
--- a/src/Hqub.MusicBrainz/Services/SearchRequest.cs
+++ b/src/Hqub.MusicBrainz/Services/SearchRequest.cs
@@ -1,6 +1,7 @@
 namespace Hqub.MusicBrainz.Services
 {
-    using System;
+    using Hqub.MusicBrainz.Entities;
+    using Hqub.MusicBrainz.Entities.Collections;
     using System.Threading;
     using System.Threading.Tasks;
 
@@ -8,16 +9,23 @@
     /// Prepare a search request to the MusicBrainz web service.
     /// </summary>
     /// <typeparam name="T">Any supported MusicBrainz entity.</typeparam>
-    public class SearchRequest<T>
+    public abstract class SearchRequest<T>
     {
-        private readonly string EntityName;
-
         private readonly MusicBrainzClient client;
-        private readonly UrlBuilder builder;
 
-        private string query;
-        private int limit = 25;
-        private int offset = 0;
+        internal readonly UrlBuilder builder;
+
+        /// <summary>Entity name.</summary>
+        protected readonly string EntityName;
+
+        /// <summary>The search query.</summary>
+        protected string query;
+
+        /// <summary>Limit of fetched items.</summary>
+        protected int limit = 25;
+
+        /// <summary>Offset to start browsing.</summary>
+        protected int offset = 0;
 
         internal SearchRequest(MusicBrainzClient client, UrlBuilder builder, string query, string entity)
         {
@@ -66,18 +74,16 @@ public SearchRequest<T> Offset(int offset)
         /// </summary>
         /// <param name="ct">The cancellation token.</param>
         /// <returns></returns>
-        public async Task<T> GetAsync(CancellationToken ct = default)
+        public async Task<QueryResult<T>> GetAsync(CancellationToken ct = default)
         {
-            if (string.IsNullOrEmpty(query))
-            {
-                throw new ArgumentException(string.Format(Resources.Messages.MissingParameter, "query"));
-            }
-
-            string url = builder.CreateSearchUrl(EntityName, query, limit, offset);
-
-            return await client.GetAsync<T>(url, ct);
+            return await SearchAsync(client, ct);
         }
 
+        /// <summary>
+        /// Initiate the actual request.
+        /// </summary>
+        protected abstract Task<QueryResult<T>> SearchAsync(MusicBrainzClient client, CancellationToken ct);
+
         /// <summary>
         /// Returns the request path.
         /// </summary>
@@ -86,4 +92,98 @@ public override string ToString()
             return builder.CreateSearchUrl(EntityName, query, limit, offset);
         }
     }
+
+    #region Helper classes
+
+    class ArtistSearchRequest : SearchRequest<Artist>
+    {
+        public ArtistSearchRequest(MusicBrainzClient client, UrlBuilder builder, string query, string entity)
+            : base(client, builder, query, entity)
+        {
+        }
+
+        /// <inheritdoc />
+        protected override async Task<QueryResult<Artist>> SearchAsync(MusicBrainzClient client, CancellationToken ct)
+        {
+            string url = builder.CreateSearchUrl(EntityName, query, limit, offset);
+
+            var list = await client.GetAsync<ArtistList>(url, ct);
+
+            return new QueryResult<Artist>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+        }
+    }
+
+    class LabelSearchRequest : SearchRequest<Label>
+    {
+        public LabelSearchRequest(MusicBrainzClient client, UrlBuilder builder, string query, string entity)
+            : base(client, builder, query, entity)
+        {
+        }
+
+        /// <inheritdoc />
+        protected override async Task<QueryResult<Label>> SearchAsync(MusicBrainzClient client, CancellationToken ct)
+        {
+            string url = builder.CreateSearchUrl(EntityName, query, limit, offset);
+
+            var list = await client.GetAsync<LabelList>(url, ct);
+
+            return new QueryResult<Label>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+        }
+    }
+
+    class RecordingSearchRequest : SearchRequest<Recording>
+    {
+        public RecordingSearchRequest(MusicBrainzClient client, UrlBuilder builder, string query, string entity)
+            : base(client, builder, query, entity)
+        {
+        }
+
+        /// <inheritdoc />
+        protected override async Task<QueryResult<Recording>> SearchAsync(MusicBrainzClient client, CancellationToken ct)
+        {
+            string url = builder.CreateSearchUrl(EntityName, query, limit, offset);
+
+            var list = await client.GetAsync<RecordingList>(url, ct);
+
+            return new QueryResult<Recording>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+        }
+    }
+
+    class ReleaseGroupSearchRequest : SearchRequest<ReleaseGroup>
+    {
+        public ReleaseGroupSearchRequest(MusicBrainzClient client, UrlBuilder builder, string query, string entity)
+            : base(client, builder, query, entity)
+        {
+        }
+
+        /// <inheritdoc />
+        protected override async Task<QueryResult<ReleaseGroup>> SearchAsync(MusicBrainzClient client, CancellationToken ct)
+        {
+            string url = builder.CreateSearchUrl(EntityName, query, limit, offset);
+
+            var list = await client.GetAsync<ReleaseGroupList>(url, ct);
+
+            return new QueryResult<ReleaseGroup>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+        }
+    }
+
+    class ReleaseSearchRequest : SearchRequest<Release>
+    {
+        public ReleaseSearchRequest(MusicBrainzClient client, UrlBuilder builder, string query, string entity)
+            : base(client, builder, query, entity)
+        {
+        }
+
+        /// <inheritdoc />
+        protected override async Task<QueryResult<Release>> SearchAsync(MusicBrainzClient client, CancellationToken ct)
+        {
+            string url = builder.CreateSearchUrl(EntityName, query, limit, offset);
+
+            var list = await client.GetAsync<ReleaseList>(url, ct);
+
+            return new QueryResult<Release>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+        }
+    }
+
+    #endregion
 }

From b1389a3661d6a56129de5c5da40b3b4ab5ac03cd Mon Sep 17 00:00:00 2001
From: wo80 <christian.woltering@tu-dortmund.de>
Date: Sat, 11 Oct 2025 10:49:56 +0200
Subject: [PATCH 2/8] Refactor services (2)

Introduce base interfaces for lookup, search and browse requests.
---
 .../Services/IArtistService.cs                | 76 +-----------------
 .../Services/IBrowseService.cs                | 32 ++++++++
 .../Services/ILabelService.cs                 | 76 +-----------------
 .../Services/ILookupService.cs                | 26 +++++++
 .../Services/IRecordingService.cs             | 76 +-----------------
 .../Services/IReleaseGroupService.cs          | 76 +-----------------
 .../Services/IReleaseService.cs               | 77 +------------------
 .../Services/ISearchService.cs                | 46 +++++++++++
 src/Hqub.MusicBrainz/Services/IWorkService.cs | 17 +---
 9 files changed, 110 insertions(+), 392 deletions(-)
 create mode 100644 src/Hqub.MusicBrainz/Services/IBrowseService.cs
 create mode 100644 src/Hqub.MusicBrainz/Services/ILookupService.cs
 create mode 100644 src/Hqub.MusicBrainz/Services/ISearchService.cs

diff --git a/src/Hqub.MusicBrainz/Services/IArtistService.cs b/src/Hqub.MusicBrainz/Services/IArtistService.cs
index 3c6ac58..9d5f939 100644
--- a/src/Hqub.MusicBrainz/Services/IArtistService.cs
+++ b/src/Hqub.MusicBrainz/Services/IArtistService.cs
@@ -1,85 +1,11 @@
 namespace Hqub.MusicBrainz.Services
 {
     using Hqub.MusicBrainz.Entities;
-    using System.Threading.Tasks;
 
     /// <summary>
     /// Interface defining the artist service.
     /// </summary>
-    public interface IArtistService
+    public interface IArtistService : ILookupService<Artist>, ISearchService<Artist>, IBrowseService<Artist>
     {
-        /// <summary>
-        /// Create a request to lookup an artist in the MusicBrainz database.
-        /// </summary>
-        /// <param name="id">The id of the artist in the MusicBrainz database.</param>
-        /// <param name="inc">A list of entities to include (sub-queries).</param>
-        /// <returns></returns>
-        LookupRequest<Artist> Get(string id, params string[] inc);
-
-        /// <summary>
-        /// Create a request to search for an artist in the MusicBrainz database, matching the given query.
-        /// </summary>
-        /// <param name="query">The query string.</param>
-        /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
-        /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
-        /// <returns></returns>
-        SearchRequest<Artist> Search(string query, int limit = 25, int offset = 0);
-
-        /// <summary>
-        /// Create a request to search for an artist in the MusicBrainz database, matching the given query.
-        /// </summary>
-        /// <param name="query">The query parameters.</param>
-        /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
-        /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
-        /// <returns></returns>
-        SearchRequest<Artist> Search(QueryParameters<Artist> query, int limit = 25, int offset = 0);
-
-        /// <summary>
-        /// Create a request to browse all artists in the MusicBrainz database, which are linked to the entity with given id.
-        /// </summary>
-        /// <param name="entity">The name of the related entity.</param>
-        /// <param name="id">The id of the related entity.</param>
-        /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
-        /// <param name="offset">Return results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
-        /// <param name="inc">A list of entities to include (sub-queries).</param>
-        /// <returns></returns>
-        BrowseRequest<Artist> Browse(string entity, string id, int limit = 25, int offset = 0, params string[] inc);
-
-        /// <summary>
-        /// Lookup an artist in the MusicBrainz database.
-        /// </summary>
-        /// <param name="id">The id of the artist in the MusicBrainz database.</param>
-        /// <param name="inc">A list of entities to include (sub-queries).</param>
-        /// <returns></returns>
-        Task<Artist> GetAsync(string id, params string[] inc);
-
-        /// <summary>
-        /// Search for an artist in the MusicBrainz database, matching the given query.
-        /// </summary>
-        /// <param name="query">The query string.</param>
-        /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
-        /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
-        /// <returns></returns>
-        Task<QueryResult<Artist>> SearchAsync(string query, int limit = 25, int offset = 0);
-
-        /// <summary>
-        /// Search for an artist in the MusicBrainz database, matching the given query.
-        /// </summary>
-        /// <param name="query">The query parameters.</param>
-        /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
-        /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
-        /// <returns></returns>
-        Task<QueryResult<Artist>> SearchAsync(QueryParameters<Artist> query, int limit = 25, int offset = 0);
-
-        /// <summary>
-        /// Browse all artists in the MusicBrainz database, which are linked to the entity with given id.
-        /// </summary>
-        /// <param name="entity">The name of the related entity.</param>
-        /// <param name="id">The id of the related entity.</param>
-        /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
-        /// <param name="offset">Return results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
-        /// <param name="inc">A list of entities to include (sub-queries).</param>
-        /// <returns></returns>
-        Task<QueryResult<Artist>> BrowseAsync(string entity, string id, int limit = 25, int offset = 0, params string[] inc);
     }
 }
diff --git a/src/Hqub.MusicBrainz/Services/IBrowseService.cs b/src/Hqub.MusicBrainz/Services/IBrowseService.cs
new file mode 100644
index 0000000..60ec931
--- /dev/null
+++ b/src/Hqub.MusicBrainz/Services/IBrowseService.cs
@@ -0,0 +1,32 @@
+namespace Hqub.MusicBrainz.Services
+{
+    using System.Threading.Tasks;
+
+    /// <summary>
+    /// Interface defining the entity service.
+    /// </summary>
+    public interface IBrowseService<T>
+    {
+        /// <summary>
+        /// Create a request to browse all entities in the MusicBrainz database, which are linked to the entity with given id.
+        /// </summary>
+        /// <param name="entity">The name of the related entity.</param>
+        /// <param name="id">The id of the related entity.</param>
+        /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
+        /// <param name="offset">Return results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
+        /// <param name="inc">A list of entities to include (sub-queries).</param>
+        /// <returns></returns>
+        BrowseRequest<T> Browse(string entity, string id, int limit = 25, int offset = 0, params string[] inc);
+
+        /// <summary>
+        /// Browse all entities in the MusicBrainz database, which are linked to the entity with given id.
+        /// </summary>
+        /// <param name="entity">The name of the related entity.</param>
+        /// <param name="id">The id of the related entity.</param>
+        /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
+        /// <param name="offset">Return results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
+        /// <param name="inc">A list of entities to include (sub-queries).</param>
+        /// <returns></returns>
+        Task<QueryResult<T>> BrowseAsync(string entity, string id, int limit = 25, int offset = 0, params string[] inc);
+    }
+}
diff --git a/src/Hqub.MusicBrainz/Services/ILabelService.cs b/src/Hqub.MusicBrainz/Services/ILabelService.cs
index 1b69296..2ceda3a 100644
--- a/src/Hqub.MusicBrainz/Services/ILabelService.cs
+++ b/src/Hqub.MusicBrainz/Services/ILabelService.cs
@@ -1,85 +1,11 @@
 namespace Hqub.MusicBrainz.Services
 {
     using Hqub.MusicBrainz.Entities;
-    using System.Threading.Tasks;
 
     /// <summary>
     /// Interface defining the label service.
     /// </summary>
-    public interface ILabelService
+    public interface ILabelService : ILookupService<Label>, ISearchService<Label>, IBrowseService<Label>
     {
-        /// <summary>
-        /// Create a request to lookup a label in the MusicBrainz database.
-        /// </summary>
-        /// <param name="id">The id of the label in the MusicBrainz database.</param>
-        /// <param name="inc">A list of entities to include (sub-queries).</param>
-        /// <returns></returns>
-        LookupRequest<Label> Get(string id, params string[] inc);
-
-        /// <summary>
-        /// Create a request to search for a label in the MusicBrainz database, matching the given query.
-        /// </summary>
-        /// <param name="query">The query string.</param>
-        /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
-        /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
-        /// <returns></returns>
-        SearchRequest<Label> Search(string query, int limit = 25, int offset = 0);
-
-        /// <summary>
-        /// Create a request to search for a label in the MusicBrainz database, matching the given query.
-        /// </summary>
-        /// <param name="query">The query parameters.</param>
-        /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
-        /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
-        /// <returns></returns>
-        SearchRequest<Label> Search(QueryParameters<Label> query, int limit = 25, int offset = 0);
-
-        /// <summary>
-        /// Create a request to browse all labels in the MusicBrainz database, which are linked to the entity with given id.
-        /// </summary>
-        /// <param name="entity">The name of the related entity.</param>
-        /// <param name="id">The id of the related entity.</param>
-        /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
-        /// <param name="offset">Return results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
-        /// <param name="inc">A list of entities to include (sub-queries).</param>
-        /// <returns></returns>
-        BrowseRequest<Label> Browse(string entity, string id, int limit = 25, int offset = 0, params string[] inc);
-
-        /// <summary>
-        /// Lookup a label in the MusicBrainz database.
-        /// </summary>
-        /// <param name="id">The id of the label in the MusicBrainz database.</param>
-        /// <param name="inc">A list of entities to include (sub-queries).</param>
-        /// <returns></returns>
-        Task<Label> GetAsync(string id, params string[] inc);
-
-        /// <summary>
-        /// Search for a label in the MusicBrainz database, matching the given query.
-        /// </summary>
-        /// <param name="query">The query string.</param>
-        /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
-        /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
-        /// <returns></returns>
-        Task<QueryResult<Label>> SearchAsync(string query, int limit = 25, int offset = 0);
-
-        /// <summary>
-        /// Search for a label in the MusicBrainz database, matching the given query.
-        /// </summary>
-        /// <param name="query">The query parameters.</param>
-        /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
-        /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
-        /// <returns></returns>
-        Task<QueryResult<Label>> SearchAsync(QueryParameters<Label> query, int limit = 25, int offset = 0);
-
-        /// <summary>
-        /// Browse all labels in the MusicBrainz database, which are linked to the entity with given id.
-        /// </summary>
-        /// <param name="entity">The name of the related entity.</param>
-        /// <param name="id">The id of the related entity.</param>
-        /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
-        /// <param name="offset">Return results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
-        /// <param name="inc">A list of entities to include (sub-queries).</param>
-        /// <returns></returns>
-        Task<QueryResult<Label>> BrowseAsync(string entity, string id, int limit = 25, int offset = 0, params string[] inc);
     }
 }
diff --git a/src/Hqub.MusicBrainz/Services/ILookupService.cs b/src/Hqub.MusicBrainz/Services/ILookupService.cs
new file mode 100644
index 0000000..1579638
--- /dev/null
+++ b/src/Hqub.MusicBrainz/Services/ILookupService.cs
@@ -0,0 +1,26 @@
+namespace Hqub.MusicBrainz.Services
+{
+    using System.Threading.Tasks;
+
+    /// <summary>
+    /// Interface defining the entity lookup service.
+    /// </summary>
+    public interface ILookupService<T>
+    {
+        /// <summary>
+        /// Create a request to lookup an entity in the MusicBrainz database.
+        /// </summary>
+        /// <param name="id">The id of the entity in the MusicBrainz database.</param>
+        /// <param name="inc">A list of entities to include (sub-queries).</param>
+        /// <returns></returns>
+        LookupRequest<T> Get(string id, params string[] inc);
+
+        /// <summary>
+        /// Lookup an entity in the MusicBrainz database.
+        /// </summary>
+        /// <param name="id">The id of the entity in the MusicBrainz database.</param>
+        /// <param name="inc">A list of entities to include (sub-queries).</param>
+        /// <returns></returns>
+        Task<T> GetAsync(string id, params string[] inc);
+    }
+}
diff --git a/src/Hqub.MusicBrainz/Services/IRecordingService.cs b/src/Hqub.MusicBrainz/Services/IRecordingService.cs
index 5cffe07..483de36 100644
--- a/src/Hqub.MusicBrainz/Services/IRecordingService.cs
+++ b/src/Hqub.MusicBrainz/Services/IRecordingService.cs
@@ -1,85 +1,11 @@
 namespace Hqub.MusicBrainz.Services
 {
     using Hqub.MusicBrainz.Entities;
-    using System.Threading.Tasks;
 
     /// <summary>
     /// Interface defining the recording service.
     /// </summary>
-    public interface IRecordingService
+    public interface IRecordingService : ILookupService<Recording>, ISearchService<Recording>, IBrowseService<Recording>
     {
-        /// <summary>
-        /// Create a request to lookup a recording in the MusicBrainz database.
-        /// </summary>
-        /// <param name="id">The id of the recording in the MusicBrainz database.</param>
-        /// <param name="inc">A list of entities to include (sub-queries).</param>
-        /// <returns></returns>
-        LookupRequest<Recording> Get(string id, params string[] inc);
-
-        /// <summary>
-        /// Create a request to search for a recording in the MusicBrainz database, matching the given query.
-        /// </summary>
-        /// <param name="query">The query string.</param>
-        /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
-        /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
-        /// <returns></returns>
-        SearchRequest<Recording> Search(string query, int limit = 25, int offset = 0);
-
-        /// <summary>
-        /// Create a request to search for a recording in the MusicBrainz database, matching the given query.
-        /// </summary>
-        /// <param name="query">The query parameters.</param>
-        /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
-        /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
-        /// <returns></returns>
-        SearchRequest<Recording> Search(QueryParameters<Recording> query, int limit = 25, int offset = 0);
-
-        /// <summary>
-        /// Create a request to browse all recordings in the MusicBrainz database, which are linked to the entity with given id.
-        /// </summary>
-        /// <param name="entity">The name of the related entity.</param>
-        /// <param name="id">The id of the related entity.</param>
-        /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
-        /// <param name="offset">Return results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
-        /// <param name="inc">A list of entities to include (sub-queries).</param>
-        /// <returns></returns>
-        BrowseRequest<Recording> Browse(string entity, string id, int limit = 25, int offset = 0, params string[] inc);
-
-        /// <summary>
-        /// Lookup a recording in the MusicBrainz database.
-        /// </summary>
-        /// <param name="id">The id of the recording in the MusicBrainz database.</param>
-        /// <param name="inc">A list of entities to include (sub-queries).</param>
-        /// <returns></returns>
-        Task<Recording> GetAsync(string id, params string[] inc);
-
-        /// <summary>
-        /// Search for a recording in the MusicBrainz database, matching the given query.
-        /// </summary>
-        /// <param name="query">The query string.</param>
-        /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
-        /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
-        /// <returns></returns>
-        Task<QueryResult<Recording>> SearchAsync(string query, int limit = 25, int offset = 0);
-
-        /// <summary>
-        /// Search for a recording in the MusicBrainz database, matching the given query.
-        /// </summary>
-        /// <param name="query">The query parameters.</param>
-        /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
-        /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
-        /// <returns></returns>
-        Task<QueryResult<Recording>> SearchAsync(QueryParameters<Recording> query, int limit = 25, int offset = 0);
-
-        /// <summary>
-        /// Browse all recordings in the MusicBrainz database, which are linked to the entity with given id.
-        /// </summary>
-        /// <param name="entity">The name of the related entity.</param>
-        /// <param name="id">The id of the related entity.</param>
-        /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
-        /// <param name="offset">Return results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
-        /// <param name="inc">A list of entities to include (sub-queries).</param>
-        /// <returns></returns>
-        Task<QueryResult<Recording>> BrowseAsync(string entity, string id, int limit = 25, int offset = 0, params string[] inc);
     }
 }
diff --git a/src/Hqub.MusicBrainz/Services/IReleaseGroupService.cs b/src/Hqub.MusicBrainz/Services/IReleaseGroupService.cs
index 35923e1..6a1e4d1 100644
--- a/src/Hqub.MusicBrainz/Services/IReleaseGroupService.cs
+++ b/src/Hqub.MusicBrainz/Services/IReleaseGroupService.cs
@@ -6,82 +6,8 @@
     /// <summary>
     /// Interface defining the release-group service.
     /// </summary>
-    public interface IReleaseGroupService
+    public interface IReleaseGroupService : ILookupService<ReleaseGroup>, ISearchService<ReleaseGroup>, IBrowseService<ReleaseGroup>
     {
-        /// <summary>
-        /// Create a request to lookup a release-group in the MusicBrainz database.
-        /// </summary>
-        /// <param name="id">The id of the release-group in the MusicBrainz database.</param>
-        /// <param name="inc">A list of entities to include (sub-queries).</param>
-        /// <returns></returns>
-        LookupRequest<ReleaseGroup> Get(string id, params string[] inc);
-
-        /// <summary>
-        /// Create a request to search for a release-group in the MusicBrainz database, matching the given query.
-        /// </summary>
-        /// <param name="query">The query string.</param>
-        /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
-        /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
-        /// <returns></returns>
-        SearchRequest<ReleaseGroup> Search(string query, int limit = 25, int offset = 0);
-
-        /// <summary>
-        /// Create a request to search for a release-group in the MusicBrainz database, matching the given query.
-        /// </summary>
-        /// <param name="query">The query parameters.</param>
-        /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
-        /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
-        /// <returns></returns>
-        SearchRequest<ReleaseGroup> Search(QueryParameters<ReleaseGroup> query, int limit = 25, int offset = 0);
-
-        /// <summary>
-        /// Create a request to browse all release-groups in the MusicBrainz database, which are linked to the entity with given id.
-        /// </summary>
-        /// <param name="entity">The name of the related entity.</param>
-        /// <param name="id">The id of the related entity.</param>
-        /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
-        /// <param name="offset">Return results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
-        /// <param name="inc">A list of entities to include (sub-queries).</param>
-        /// <returns></returns>
-        BrowseRequest<ReleaseGroup> Browse(string entity, string id, int limit = 25, int offset = 0, params string[] inc);
-
-        /// <summary>
-        /// Lookup a release-group in the MusicBrainz database.
-        /// </summary>
-        /// <param name="id">The id of the release-group in the MusicBrainz database.</param>
-        /// <param name="inc">A list of entities to include (sub-queries).</param>
-        /// <returns></returns>
-        Task<ReleaseGroup> GetAsync(string id, params string[] inc);
-
-        /// <summary>
-        /// Search for a release-group in the MusicBrainz database, matching the given query.
-        /// </summary>
-        /// <param name="query">The query string.</param>
-        /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
-        /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
-        /// <returns></returns>
-        Task<QueryResult<ReleaseGroup>> SearchAsync(string query, int limit = 25, int offset = 0);
-
-        /// <summary>
-        /// Search for a release-group in the MusicBrainz database, matching the given query.
-        /// </summary>
-        /// <param name="query">The query parameters.</param>
-        /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
-        /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
-        /// <returns></returns>
-        Task<QueryResult<ReleaseGroup>> SearchAsync(QueryParameters<ReleaseGroup> query, int limit = 25, int offset = 0);
-
-        /// <summary>
-        /// Browse all release-groups in the MusicBrainz database, which are linked to the entity with given id.
-        /// </summary>
-        /// <param name="entity">The name of the related entity.</param>
-        /// <param name="id">The id of the related entity.</param>
-        /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
-        /// <param name="offset">Return results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
-        /// <param name="inc">A list of entities to include (sub-queries).</param>
-        /// <returns></returns>
-        Task<QueryResult<ReleaseGroup>> BrowseAsync(string entity, string id, int limit = 25, int offset = 0, params string[] inc);
-
         /// <summary>
         /// Browse all release-groups in the MusicBrainz database, which are linked to the entity with given id.
         /// </summary>
diff --git a/src/Hqub.MusicBrainz/Services/IReleaseService.cs b/src/Hqub.MusicBrainz/Services/IReleaseService.cs
index be8a43b..59e575d 100644
--- a/src/Hqub.MusicBrainz/Services/IReleaseService.cs
+++ b/src/Hqub.MusicBrainz/Services/IReleaseService.cs
@@ -6,83 +6,8 @@
     /// <summary>
     /// Interface defining the release service.
     /// </summary>
-    public interface IReleaseService
+    public interface IReleaseService : ILookupService<Release>, ISearchService<Release>, IBrowseService<Release>
     {
-        /// <summary>
-        /// Create a request to lookup a release in the MusicBrainz database.
-        /// </summary>
-        /// <param name="id">The id of the release in the MusicBrainz database.</param>
-        /// <param name="inc">A list of entities to include (sub-queries).</param>
-        /// <returns></returns>
-        LookupRequest<Release> Get(string id, params string[] inc);
-
-        /// <summary>
-        /// Create a request to search for a release in the MusicBrainz database, matching the given query.
-        /// </summary>
-        /// <param name="query">The query string.</param>
-        /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
-        /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
-        /// <returns></returns>
-        SearchRequest<Release> Search(string query, int limit = 25, int offset = 0);
-
-        /// <summary>
-        /// Create a request to search for a release in the MusicBrainz database, matching the given query.
-        /// </summary>
-        /// <param name="query">The query parameters.</param>
-        /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
-        /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
-        /// <returns></returns>
-        SearchRequest<Release> Search(QueryParameters<Release> query, int limit = 25, int offset = 0);
-
-        /// <summary>
-        /// Create a request to browse all releases in the MusicBrainz database, which are linked to the entity with given id.
-        /// </summary>
-        /// <param name="entity">The name of the related entity.</param>
-        /// <param name="id">The id of the related entity.</param>
-        /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
-        /// <param name="offset">Return results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
-        /// <param name="inc">A list of entities to include (sub-queries).</param>
-        /// <returns></returns>
-        BrowseRequest<Release> Browse(string entity, string id, int limit = 25, int offset = 0, params string[] inc);
-
-        /// <summary>
-        /// Lookup a release in the MusicBrainz database.
-        /// </summary>
-        /// <param name="id">The id of the release in the MusicBrainz database.</param>
-        /// <param name="inc">A list of entities to include (sub-queries).</param>
-        /// <returns></returns>
-        Task<Release> GetAsync(string id, params string[] inc);
-
-        /// <summary>
-        /// Search for a release in the MusicBrainz database, matching the given query.
-        /// </summary>
-        /// <param name="query">The query string.</param>
-        /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
-        /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
-        /// <returns></returns>
-        Task<QueryResult<Release>> SearchAsync(string query, int limit = 25, int offset = 0);
-
-        /// <summary>
-        /// Search for a release in the MusicBrainz database, matching the given query.
-        /// </summary>
-        /// <param name="query">The query parameters.</param>
-        /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
-        /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
-        /// <returns></returns>
-        Task<QueryResult<Release>> SearchAsync(QueryParameters<Release> query, int limit = 25, int offset = 0);
-
-        /// <summary>
-        /// Browse all releases in the MusicBrainz database, which are linked to the entity with given id.
-        /// </summary>
-        /// <param name="entity">The name of the related entity.</param>
-        /// <param name="id">The id of the related entity.</param>
-        /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
-        /// <param name="offset">Return results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
-        /// <param name="inc">A list of entities to include (sub-queries).</param>
-        /// <returns></returns>
-        Task<QueryResult<Release>> BrowseAsync(string entity, string id, int limit = 25,
-            int offset = 0, params string[] inc);
-
         /// <summary>
         /// Browse all releases in the MusicBrainz database, which are linked to the entity with given id.
         /// </summary>
diff --git a/src/Hqub.MusicBrainz/Services/ISearchService.cs b/src/Hqub.MusicBrainz/Services/ISearchService.cs
new file mode 100644
index 0000000..2f253b1
--- /dev/null
+++ b/src/Hqub.MusicBrainz/Services/ISearchService.cs
@@ -0,0 +1,46 @@
+namespace Hqub.MusicBrainz.Services
+{
+    using System.Threading.Tasks;
+
+    /// <summary>
+    /// Interface defining the entity service.
+    /// </summary>
+    public interface ISearchService<T>
+    {
+        /// <summary>
+        /// Create a request to search for an entity in the MusicBrainz database, matching the given query.
+        /// </summary>
+        /// <param name="query">The query string.</param>
+        /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
+        /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
+        /// <returns></returns>
+        SearchRequest<T> Search(string query, int limit = 25, int offset = 0);
+
+        /// <summary>
+        /// Create a request to search for an entity in the MusicBrainz database, matching the given query.
+        /// </summary>
+        /// <param name="query">The query parameters.</param>
+        /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
+        /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
+        /// <returns></returns>
+        SearchRequest<T> Search(QueryParameters<T> query, int limit = 25, int offset = 0);
+
+        /// <summary>
+        /// Search for an entity in the MusicBrainz database, matching the given query.
+        /// </summary>
+        /// <param name="query">The query string.</param>
+        /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
+        /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
+        /// <returns></returns>
+        Task<QueryResult<T>> SearchAsync(string query, int limit = 25, int offset = 0);
+
+        /// <summary>
+        /// Search for an entity in the MusicBrainz database, matching the given query.
+        /// </summary>
+        /// <param name="query">The query parameters.</param>
+        /// <param name="limit">The number of entries to return (max. number of entries returned per page is 100, default = 25).</param>
+        /// <param name="offset">Return search results starting at a given offset. Used for paging through more than one page of results (default = 0).</param>
+        /// <returns></returns>
+        Task<QueryResult<T>> SearchAsync(QueryParameters<T> query, int limit = 25, int offset = 0);
+    }
+}
diff --git a/src/Hqub.MusicBrainz/Services/IWorkService.cs b/src/Hqub.MusicBrainz/Services/IWorkService.cs
index 664bdc5..881581c 100644
--- a/src/Hqub.MusicBrainz/Services/IWorkService.cs
+++ b/src/Hqub.MusicBrainz/Services/IWorkService.cs
@@ -6,22 +6,7 @@
     /// <summary>
     /// Interface defining the work service.
     /// </summary>
-    public interface IWorkService
+    public interface IWorkService : ILookupService<Work>
     {
-        /// <summary>
-        /// Create a request to lookup a work in the MusicBrainz database.
-        /// </summary>
-        /// <param name="id">The id of the work in the MusicBrainz database.</param>
-        /// <param name="inc">A list of entities to include (sub-queries).</param>
-        /// <returns></returns>
-        LookupRequest<Work> Get(string id, params string[] inc);
-
-        /// <summary>
-        /// Lookup a work in the MusicBrainz database.
-        /// </summary>
-        /// <param name="id">The id of the work in the MusicBrainz database.</param>
-        /// <param name="inc">A list of entities to include (sub-queries).</param>
-        /// <returns></returns>
-        Task<Work> GetAsync(string id, params string[] inc);
     }
 }

From 3ac0cd6ecb3eeab9d4cd32cea96061ea0a0d90a6 Mon Sep 17 00:00:00 2001
From: wo80 <christian.woltering@tu-dortmund.de>
Date: Sat, 11 Oct 2025 10:52:53 +0200
Subject: [PATCH 3/8] Refactor services (3)

Introduce base LookupService class and remove specialized WorkService.
---
 src/Hqub.MusicBrainz/MusicBrainzClient.cs     |  6 ++-
 .../Services/LookupService.cs                 | 52 +++++++++++++++++++
 src/Hqub.MusicBrainz/Services/WorkService.cs  | 52 -------------------
 3 files changed, 56 insertions(+), 54 deletions(-)
 create mode 100644 src/Hqub.MusicBrainz/Services/LookupService.cs
 delete mode 100644 src/Hqub.MusicBrainz/Services/WorkService.cs

diff --git a/src/Hqub.MusicBrainz/MusicBrainzClient.cs b/src/Hqub.MusicBrainz/MusicBrainzClient.cs
index e4cf015..7e4b0b1 100644
--- a/src/Hqub.MusicBrainz/MusicBrainzClient.cs
+++ b/src/Hqub.MusicBrainz/MusicBrainzClient.cs
@@ -1,6 +1,7 @@
 namespace Hqub.MusicBrainz
 {
     using Hqub.MusicBrainz.Cache;
+    using Hqub.MusicBrainz.Entities;
     using Hqub.MusicBrainz.Services;
     using System;
     using System.IO;
@@ -53,7 +54,7 @@ public sealed class MusicBrainzClient : IDisposable
         /// <summary>
         /// Gets the work entity service.
         /// </summary>
-        public IWorkService Work { get; }
+        public ILookupService<Work> Work { get; }
 
         #endregion
 
@@ -113,7 +114,8 @@ public MusicBrainzClient(HttpClient httpClient)
             Recordings = new RecordingService(this, urlBuilder);
             Releases = new ReleaseService(this, urlBuilder);
             ReleaseGroups = new ReleaseGroupService(this, urlBuilder);
-            Work = new WorkService(this, urlBuilder);
+
+            Work = new LookupService<Work>(this, urlBuilder, "work");
 
             client = httpClient;
         }
diff --git a/src/Hqub.MusicBrainz/Services/LookupService.cs b/src/Hqub.MusicBrainz/Services/LookupService.cs
new file mode 100644
index 0000000..ab3f566
--- /dev/null
+++ b/src/Hqub.MusicBrainz/Services/LookupService.cs
@@ -0,0 +1,52 @@
+namespace Hqub.MusicBrainz.Services
+{
+    using System;
+    using System.Threading.Tasks;
+
+    /// <summary>
+    /// Interface defining the entity lookup service.
+    /// </summary>
+    class LookupService<T> : ILookupService<T>
+    {
+
+        private readonly MusicBrainzClient client;
+        private readonly UrlBuilder builder;
+        private readonly string entityName;
+
+        public LookupService(MusicBrainzClient client, UrlBuilder builder, string entityName)
+        {
+            this.client = client;
+            this.builder = builder;
+            this.entityName = entityName;
+        }
+
+        /// <summary>
+        /// Create a request to lookup an entity in the MusicBrainz database.
+        /// </summary>
+        /// <param name="id">The id of the entity in the MusicBrainz database.</param>
+        /// <param name="inc">A list of entities to include (sub-queries).</param>
+        /// <returns></returns>
+        public LookupRequest<T> Get(string id, params string[] inc)
+        {
+            return new LookupRequest<T>(client, builder, id, entityName).Include(inc);
+        }
+
+        /// <summary>
+        /// Lookup an entity in the MusicBrainz database.
+        /// </summary>
+        /// <param name="id">The id of the entity in the MusicBrainz database.</param>
+        /// <param name="inc">A list of entities to include (sub-queries).</param>
+        /// <returns></returns>
+        public async Task<T> GetAsync(string id, params string[] inc)
+        {
+            if (string.IsNullOrEmpty(id))
+            {
+                throw new ArgumentException(string.Format(Resources.Messages.MissingParameter, "id"));
+            }
+
+            string url = builder.CreateLookupUrl(entityName, id, inc);
+
+            return await client.GetAsync<T>(url);
+        }
+    }
+}
diff --git a/src/Hqub.MusicBrainz/Services/WorkService.cs b/src/Hqub.MusicBrainz/Services/WorkService.cs
deleted file mode 100644
index b4eca73..0000000
--- a/src/Hqub.MusicBrainz/Services/WorkService.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-namespace Hqub.MusicBrainz.Services
-{
-    using Hqub.MusicBrainz.Entities;
-    using System;
-    using System.Threading.Tasks;
-
-    class WorkService : IWorkService
-    {
-        private const string EntityName = "work";
-
-        private readonly MusicBrainzClient client;
-        private readonly UrlBuilder builder;
-
-        public WorkService(MusicBrainzClient client, UrlBuilder builder)
-        {
-            this.client = client;
-            this.builder = builder;
-        }
-
-        #region Fluent API
-
-        /// <inheritdoc />
-        public LookupRequest<Work> Get(string id, params string[] inc)
-        {
-            return new LookupRequest<Work>(client, builder, id, EntityName).Include(inc);
-        }
-
-        #endregion
-
-        #region Direct API
-
-        /// <summary>
-        /// Lookup a work in the MusicBrainz database.
-        /// </summary>
-        /// <param name="id">The work MusicBrainz id.</param>
-        /// <param name="inc">A list of entities to include (subqueries).</param>
-        /// <returns></returns>
-        public async Task<Work> GetAsync(string id, params string[] inc)
-        {
-            if (string.IsNullOrEmpty(id))
-            {
-                throw new ArgumentException(string.Format(Resources.Messages.MissingParameter, "id"));
-            }
-
-            string url = builder.CreateLookupUrl(EntityName, id, inc);
-
-            return await client.GetAsync<Work>(url);
-        }
-
-        #endregion
-    }
-}

From 4ca335f2e4a2d12909ad4fda19e976dd2a13fb31 Mon Sep 17 00:00:00 2001
From: wo80 <christian.woltering@tu-dortmund.de>
Date: Sat, 11 Oct 2025 11:01:57 +0200
Subject: [PATCH 4/8] Refactor services (4)

Introduce base IEntity interface to mark data classes that support lookup, search or browse.
---
 src/Hqub.MusicBrainz/Entities/Area.cs           |  3 +--
 src/Hqub.MusicBrainz/Entities/Artist.cs         |  2 +-
 src/Hqub.MusicBrainz/Entities/Genre.cs          |  2 +-
 src/Hqub.MusicBrainz/Entities/IEntity.cs        | 13 +++++++++++++
 src/Hqub.MusicBrainz/Entities/Label.cs          |  2 +-
 src/Hqub.MusicBrainz/Entities/Recording.cs      |  2 +-
 src/Hqub.MusicBrainz/Entities/Release.cs        |  2 +-
 src/Hqub.MusicBrainz/Entities/ReleaseGroup.cs   |  2 +-
 src/Hqub.MusicBrainz/Entities/Work.cs           |  2 +-
 src/Hqub.MusicBrainz/QueryParameters.cs         |  1 +
 src/Hqub.MusicBrainz/QueryResult.cs             |  5 +++--
 src/Hqub.MusicBrainz/Services/BrowseRequest.cs  |  2 +-
 src/Hqub.MusicBrainz/Services/IBrowseService.cs |  3 ++-
 src/Hqub.MusicBrainz/Services/ILookupService.cs |  3 ++-
 src/Hqub.MusicBrainz/Services/ISearchService.cs |  3 ++-
 src/Hqub.MusicBrainz/Services/LookupRequest.cs  |  3 ++-
 src/Hqub.MusicBrainz/Services/LookupService.cs  |  3 ++-
 src/Hqub.MusicBrainz/Services/SearchRequest.cs  |  2 +-
 18 files changed, 37 insertions(+), 18 deletions(-)
 create mode 100644 src/Hqub.MusicBrainz/Entities/IEntity.cs

diff --git a/src/Hqub.MusicBrainz/Entities/Area.cs b/src/Hqub.MusicBrainz/Entities/Area.cs
index 6477050..34f1604 100644
--- a/src/Hqub.MusicBrainz/Entities/Area.cs
+++ b/src/Hqub.MusicBrainz/Entities/Area.cs
@@ -1,7 +1,6 @@
 
 namespace Hqub.MusicBrainz.Entities
 {
-    using System;
     using System.Collections.Generic;
     using System.Runtime.Serialization;
 
@@ -10,7 +9,7 @@ namespace Hqub.MusicBrainz.Entities
     /// </summary>
     /// <see href="https://musicbrainz.org/doc/Area"/>
     [DataContract(Name = "area")]
-    public class Area
+    public class Area : IEntity
     {
         /// <summary>
         /// Gets or sets the MusicBrainz id.
diff --git a/src/Hqub.MusicBrainz/Entities/Artist.cs b/src/Hqub.MusicBrainz/Entities/Artist.cs
index 2f2b81f..680306a 100644
--- a/src/Hqub.MusicBrainz/Entities/Artist.cs
+++ b/src/Hqub.MusicBrainz/Entities/Artist.cs
@@ -10,7 +10,7 @@ namespace Hqub.MusicBrainz.Entities
     /// </summary>
     /// <see href="https://musicbrainz.org/doc/Artist"/>
     [DataContract(Name = "artist")]
-    public class Artist
+    public class Artist : IEntity
     {
         #region Properties
 
diff --git a/src/Hqub.MusicBrainz/Entities/Genre.cs b/src/Hqub.MusicBrainz/Entities/Genre.cs
index 104c5f8..85bd7e6 100644
--- a/src/Hqub.MusicBrainz/Entities/Genre.cs
+++ b/src/Hqub.MusicBrainz/Entities/Genre.cs
@@ -8,7 +8,7 @@ namespace Hqub.MusicBrainz.Entities
     /// </summary>
     /// <see href="https://musicbrainz.org/doc/Genre"/>
     [DataContract(Name = "genre")]
-    public class Genre
+    public class Genre : IEntity
     {
         /// <summary>
         /// Gets or sets the MusicBrainz id.
diff --git a/src/Hqub.MusicBrainz/Entities/IEntity.cs b/src/Hqub.MusicBrainz/Entities/IEntity.cs
new file mode 100644
index 0000000..30ed9b2
--- /dev/null
+++ b/src/Hqub.MusicBrainz/Entities/IEntity.cs
@@ -0,0 +1,13 @@
+namespace Hqub.MusicBrainz.Entities
+{
+    /// <summary>
+    /// Represents an entity in the MusicBrainz database with a unique id.
+    /// </summary>
+    public interface IEntity
+    {
+        /// <summary>
+        /// Gets or sets the MusicBrainz id.
+        /// </summary>
+        public string Id { get; set; }
+    }
+}
diff --git a/src/Hqub.MusicBrainz/Entities/Label.cs b/src/Hqub.MusicBrainz/Entities/Label.cs
index 6f7afe9..fcfd95a 100644
--- a/src/Hqub.MusicBrainz/Entities/Label.cs
+++ b/src/Hqub.MusicBrainz/Entities/Label.cs
@@ -9,7 +9,7 @@ namespace Hqub.MusicBrainz.Entities
     /// </summary>
     /// <see href="https://musicbrainz.org/doc/Label"/>
     [DataContract(Name = "label")]
-    public class Label
+    public class Label : IEntity
     {
         #region Properties
 
diff --git a/src/Hqub.MusicBrainz/Entities/Recording.cs b/src/Hqub.MusicBrainz/Entities/Recording.cs
index 37e5526..4dbee2a 100644
--- a/src/Hqub.MusicBrainz/Entities/Recording.cs
+++ b/src/Hqub.MusicBrainz/Entities/Recording.cs
@@ -10,7 +10,7 @@ namespace Hqub.MusicBrainz.Entities
     /// </summary>
     /// <see href="https://musicbrainz.org/doc/Recording"/>
     [DataContract(Name = "recording")]
-    public class Recording
+    public class Recording : IEntity
     {
         #region Properties
 
diff --git a/src/Hqub.MusicBrainz/Entities/Release.cs b/src/Hqub.MusicBrainz/Entities/Release.cs
index 43545db..f24b200 100644
--- a/src/Hqub.MusicBrainz/Entities/Release.cs
+++ b/src/Hqub.MusicBrainz/Entities/Release.cs
@@ -10,7 +10,7 @@ namespace Hqub.MusicBrainz.Entities
     /// </summary>
     /// <see href="https://musicbrainz.org/doc/Release"/>
     [DataContract(Name = "release")]
-    public class Release
+    public class Release : IEntity
     {
         #region Properties
 
diff --git a/src/Hqub.MusicBrainz/Entities/ReleaseGroup.cs b/src/Hqub.MusicBrainz/Entities/ReleaseGroup.cs
index 4ce1de5..37a0184 100644
--- a/src/Hqub.MusicBrainz/Entities/ReleaseGroup.cs
+++ b/src/Hqub.MusicBrainz/Entities/ReleaseGroup.cs
@@ -9,7 +9,7 @@ namespace Hqub.MusicBrainz.Entities
     /// </summary>
     /// <see href="https://musicbrainz.org/doc/Release_Group"/>
     [DataContract(Name = "release-group")]
-    public class ReleaseGroup
+    public class ReleaseGroup : IEntity
     {
         #region Properties
 
diff --git a/src/Hqub.MusicBrainz/Entities/Work.cs b/src/Hqub.MusicBrainz/Entities/Work.cs
index 2bdb176..5b4ebea 100644
--- a/src/Hqub.MusicBrainz/Entities/Work.cs
+++ b/src/Hqub.MusicBrainz/Entities/Work.cs
@@ -10,7 +10,7 @@ namespace Hqub.MusicBrainz.Entities
     /// </summary>
     /// <see href="https://musicbrainz.org/doc/Work"/>
     [DataContract(Name = "work")]
-    public class Work
+    public class Work : IEntity
     {
         #region Properties
 
diff --git a/src/Hqub.MusicBrainz/QueryParameters.cs b/src/Hqub.MusicBrainz/QueryParameters.cs
index 7dcb114..eabc266 100644
--- a/src/Hqub.MusicBrainz/QueryParameters.cs
+++ b/src/Hqub.MusicBrainz/QueryParameters.cs
@@ -15,6 +15,7 @@ namespace Hqub.MusicBrainz
     /// See https://musicbrainz.org/doc/Development/XML_Web_Service/Version_2/Search
     /// </remarks>
     public class QueryParameters<T> : IEnumerable<QueryParameters<T>.Node>
+         where T : IEntity
     {
         private readonly List<Node> nodes;
 
diff --git a/src/Hqub.MusicBrainz/QueryResult.cs b/src/Hqub.MusicBrainz/QueryResult.cs
index f97b863..36b7e5c 100644
--- a/src/Hqub.MusicBrainz/QueryResult.cs
+++ b/src/Hqub.MusicBrainz/QueryResult.cs
@@ -1,4 +1,5 @@
-using System.Collections;
+using Hqub.MusicBrainz.Entities;
+using System.Collections;
 using System.Collections.Generic;
 
 namespace Hqub.MusicBrainz
@@ -6,7 +7,7 @@ namespace Hqub.MusicBrainz
     /// <summary>
     /// Abstract base class for MusicBrainz queries returning lists (with paging support).
     /// </summary>
-    public class QueryResult<T> : IEnumerable<T>
+    public class QueryResult<T> : IEnumerable<T> where T : IEntity
     {
         /// <summary>
         /// Gets or sets the total list items count.
diff --git a/src/Hqub.MusicBrainz/Services/BrowseRequest.cs b/src/Hqub.MusicBrainz/Services/BrowseRequest.cs
index 8177872..c890d70 100644
--- a/src/Hqub.MusicBrainz/Services/BrowseRequest.cs
+++ b/src/Hqub.MusicBrainz/Services/BrowseRequest.cs
@@ -9,7 +9,7 @@
     /// Prepare a browse request to the MusicBrainz web service.
     /// </summary>
     /// <typeparam name="T">Any supported MusicBrainz entity.</typeparam>
-    public abstract class BrowseRequest<T>
+    public abstract class BrowseRequest<T> where T : IEntity
     {
         private readonly MusicBrainzClient client;
 
diff --git a/src/Hqub.MusicBrainz/Services/IBrowseService.cs b/src/Hqub.MusicBrainz/Services/IBrowseService.cs
index 60ec931..0ef7148 100644
--- a/src/Hqub.MusicBrainz/Services/IBrowseService.cs
+++ b/src/Hqub.MusicBrainz/Services/IBrowseService.cs
@@ -1,11 +1,12 @@
 namespace Hqub.MusicBrainz.Services
 {
+    using Hqub.MusicBrainz.Entities;
     using System.Threading.Tasks;
 
     /// <summary>
     /// Interface defining the entity service.
     /// </summary>
-    public interface IBrowseService<T>
+    public interface IBrowseService<T> where T : IEntity
     {
         /// <summary>
         /// Create a request to browse all entities in the MusicBrainz database, which are linked to the entity with given id.
diff --git a/src/Hqub.MusicBrainz/Services/ILookupService.cs b/src/Hqub.MusicBrainz/Services/ILookupService.cs
index 1579638..f0164f9 100644
--- a/src/Hqub.MusicBrainz/Services/ILookupService.cs
+++ b/src/Hqub.MusicBrainz/Services/ILookupService.cs
@@ -1,11 +1,12 @@
 namespace Hqub.MusicBrainz.Services
 {
+    using Hqub.MusicBrainz.Entities;
     using System.Threading.Tasks;
 
     /// <summary>
     /// Interface defining the entity lookup service.
     /// </summary>
-    public interface ILookupService<T>
+    public interface ILookupService<T> where T : IEntity
     {
         /// <summary>
         /// Create a request to lookup an entity in the MusicBrainz database.
diff --git a/src/Hqub.MusicBrainz/Services/ISearchService.cs b/src/Hqub.MusicBrainz/Services/ISearchService.cs
index 2f253b1..ba9b00d 100644
--- a/src/Hqub.MusicBrainz/Services/ISearchService.cs
+++ b/src/Hqub.MusicBrainz/Services/ISearchService.cs
@@ -1,11 +1,12 @@
 namespace Hqub.MusicBrainz.Services
 {
+    using Hqub.MusicBrainz.Entities;
     using System.Threading.Tasks;
 
     /// <summary>
     /// Interface defining the entity service.
     /// </summary>
-    public interface ISearchService<T>
+    public interface ISearchService<T> where T : IEntity
     {
         /// <summary>
         /// Create a request to search for an entity in the MusicBrainz database, matching the given query.
diff --git a/src/Hqub.MusicBrainz/Services/LookupRequest.cs b/src/Hqub.MusicBrainz/Services/LookupRequest.cs
index 51b6d53..a3ac91b 100644
--- a/src/Hqub.MusicBrainz/Services/LookupRequest.cs
+++ b/src/Hqub.MusicBrainz/Services/LookupRequest.cs
@@ -1,5 +1,6 @@
 namespace Hqub.MusicBrainz.Services
 {
+    using Hqub.MusicBrainz.Entities;
     using System;
     using System.Threading;
     using System.Threading.Tasks;
@@ -8,7 +9,7 @@
     /// Prepare a lookup request to the MusicBrainz web service.
     /// </summary>
     /// <typeparam name="T">Any supported MusicBrainz entity.</typeparam>
-    public class LookupRequest<T>
+    public class LookupRequest<T> where T : IEntity
     {
         private readonly string EntityName;
 
diff --git a/src/Hqub.MusicBrainz/Services/LookupService.cs b/src/Hqub.MusicBrainz/Services/LookupService.cs
index ab3f566..c32ccd5 100644
--- a/src/Hqub.MusicBrainz/Services/LookupService.cs
+++ b/src/Hqub.MusicBrainz/Services/LookupService.cs
@@ -1,12 +1,13 @@
 namespace Hqub.MusicBrainz.Services
 {
+    using Hqub.MusicBrainz.Entities;
     using System;
     using System.Threading.Tasks;
 
     /// <summary>
     /// Interface defining the entity lookup service.
     /// </summary>
-    class LookupService<T> : ILookupService<T>
+    class LookupService<T> : ILookupService<T> where T : IEntity
     {
 
         private readonly MusicBrainzClient client;
diff --git a/src/Hqub.MusicBrainz/Services/SearchRequest.cs b/src/Hqub.MusicBrainz/Services/SearchRequest.cs
index e7f9887..33c050d 100644
--- a/src/Hqub.MusicBrainz/Services/SearchRequest.cs
+++ b/src/Hqub.MusicBrainz/Services/SearchRequest.cs
@@ -9,7 +9,7 @@
     /// Prepare a search request to the MusicBrainz web service.
     /// </summary>
     /// <typeparam name="T">Any supported MusicBrainz entity.</typeparam>
-    public abstract class SearchRequest<T>
+    public abstract class SearchRequest<T> where T : IEntity
     {
         private readonly MusicBrainzClient client;
 

From 82a21a7e991be9a09284190fd1da37dce9757a52 Mon Sep 17 00:00:00 2001
From: wo80 <christian.woltering@tu-dortmund.de>
Date: Sat, 11 Oct 2025 11:14:36 +0200
Subject: [PATCH 5/8] Refactor services (5)

Remove specialized entity collections namespace.
---
 src/Hqub.MusicBrainz.Client/Example6.cs       |  1 -
 .../Entities/Collections/ArtistList.cs        | 35 ----------
 .../Entities/Collections/LabelList.cs         | 32 ---------
 .../Entities/Collections/RecordingList.cs     | 35 ----------
 .../Entities/Collections/ReleaseGroupList.cs  | 32 ---------
 .../Entities/Collections/ReleaseList.cs       | 32 ---------
 .../Services/ArtistService.cs                 |  1 -
 .../Services/BrowseRequest.cs                 | 70 ++++++++++++++++++-
 src/Hqub.MusicBrainz/Services/LabelService.cs |  1 -
 .../Services/RecordingService.cs              |  1 -
 .../Services/ReleaseGroupService.cs           |  1 -
 .../Services/ReleaseService.cs                |  1 -
 .../Services/SearchRequest.cs                 | 70 ++++++++++++++++++-
 13 files changed, 136 insertions(+), 176 deletions(-)
 delete mode 100644 src/Hqub.MusicBrainz/Entities/Collections/ArtistList.cs
 delete mode 100644 src/Hqub.MusicBrainz/Entities/Collections/LabelList.cs
 delete mode 100644 src/Hqub.MusicBrainz/Entities/Collections/RecordingList.cs
 delete mode 100644 src/Hqub.MusicBrainz/Entities/Collections/ReleaseGroupList.cs
 delete mode 100644 src/Hqub.MusicBrainz/Entities/Collections/ReleaseList.cs

diff --git a/src/Hqub.MusicBrainz.Client/Example6.cs b/src/Hqub.MusicBrainz.Client/Example6.cs
index cbad4cf..8a6c98a 100644
--- a/src/Hqub.MusicBrainz.Client/Example6.cs
+++ b/src/Hqub.MusicBrainz.Client/Example6.cs
@@ -3,7 +3,6 @@ namespace Hqub.MusicBrainz.Client
 {
     using Hqub.MusicBrainz;
     using Hqub.MusicBrainz.Entities;
-    using Hqub.MusicBrainz.Entities.Collections;
     using System;
     using System.Threading.Tasks;
 
diff --git a/src/Hqub.MusicBrainz/Entities/Collections/ArtistList.cs b/src/Hqub.MusicBrainz/Entities/Collections/ArtistList.cs
deleted file mode 100644
index f3ec552..0000000
--- a/src/Hqub.MusicBrainz/Entities/Collections/ArtistList.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-
-namespace Hqub.MusicBrainz.Entities.Collections
-{
-    using System.Collections.Generic;
-    using System.Runtime.Serialization;
-
-    // NOTE: for MusicBrainz ws/3 these additional classes might no longer be necessary.
-    //       See https://tickets.metabrainz.org/browse/MBS-9731
-
-    [DataContract]
-    class ArtistList
-    {
-        [DataMember(Name = "count")]
-        public int Count { get; set; }
-
-        [DataMember(Name = "offset")]
-        public int Offset { get; set; }
-
-        [DataMember(Name = "artists")]
-        public List<Artist> Items { get; set; }
-    }
-
-    [DataContract]
-    class ArtistListBrowse
-    {
-        [DataMember(Name = "artists")]
-        public List<Artist> Items { get; set; }
-
-        [DataMember(Name = "artist-count")]
-        public int Count { get; set; }
-
-        [DataMember(Name = "artist-offset")]
-        public int Offset { get; set; }
-    }
-}
diff --git a/src/Hqub.MusicBrainz/Entities/Collections/LabelList.cs b/src/Hqub.MusicBrainz/Entities/Collections/LabelList.cs
deleted file mode 100644
index 5b09b3d..0000000
--- a/src/Hqub.MusicBrainz/Entities/Collections/LabelList.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-
-namespace Hqub.MusicBrainz.Entities.Collections
-{
-    using System.Collections.Generic;
-    using System.Runtime.Serialization;
-
-    [DataContract]
-    class LabelList
-    {
-        [DataMember(Name = "count")]
-        public int Count { get; set; }
-
-        [DataMember(Name = "offset")]
-        public int Offset { get; set; }
-
-        [DataMember(Name = "labels")]
-        public List<Label> Items { get; set; }
-    }
-
-    [DataContract]
-    class LabelListBrowse
-    {
-        [DataMember(Name = "labels")]
-        public List<Label> Items { get; set; }
-
-        [DataMember(Name = "label-count")]
-        public int Count { get; set; }
-
-        [DataMember(Name = "label-offset")]
-        public int Offset { get; set; }
-    }
-}
diff --git a/src/Hqub.MusicBrainz/Entities/Collections/RecordingList.cs b/src/Hqub.MusicBrainz/Entities/Collections/RecordingList.cs
deleted file mode 100644
index 1ad1441..0000000
--- a/src/Hqub.MusicBrainz/Entities/Collections/RecordingList.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-
-namespace Hqub.MusicBrainz.Entities.Collections
-{
-    using System.Collections.Generic;
-    using System.Runtime.Serialization;
-
-    [DataContract]
-    class RecordingList
-    {
-        [DataMember(Name = "count")]
-        public int Count { get; set; }
-
-        [DataMember(Name = "offset")]
-        public int Offset { get; set; }
-
-        [DataMember(Name = "recordings")]
-        public List<Recording> Items { get; set; }
-    }
-
-    // NOTE: for MusicBrainz ws/3 this additional class might no longer be necessary.
-    //       See https://tickets.metabrainz.org/browse/MBS-9731
-
-    [DataContract]
-    class RecordingListBrowse
-    {
-        [DataMember(Name = "recordings")]
-        public List<Recording> Items { get; set; }
-
-        [DataMember(Name = "recording-count")]
-        public int Count { get; set; }
-
-        [DataMember(Name = "recording-offset")]
-        public int Offset { get; set; }
-    }
-}
diff --git a/src/Hqub.MusicBrainz/Entities/Collections/ReleaseGroupList.cs b/src/Hqub.MusicBrainz/Entities/Collections/ReleaseGroupList.cs
deleted file mode 100644
index 1924d59..0000000
--- a/src/Hqub.MusicBrainz/Entities/Collections/ReleaseGroupList.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-
-namespace Hqub.MusicBrainz.Entities.Collections
-{
-    using System.Collections.Generic;
-    using System.Runtime.Serialization;
-
-    [DataContract]
-    class ReleaseGroupList
-    {
-        [DataMember(Name = "count")]
-        public int Count { get; set; }
-
-        [DataMember(Name = "offset")]
-        public int Offset { get; set; }
-
-        [DataMember(Name = "release-groups")]
-        public List<ReleaseGroup> Items { get; set; }
-    }
-
-    [DataContract]
-    class ReleaseGroupListBrowse
-    {
-        [DataMember(Name = "release-groups")]
-        public List<ReleaseGroup> Items { get; set; }
-
-        [DataMember(Name = "release-group-count")]
-        public int Count { get; set; }
-
-        [DataMember(Name = "release-group-offset")]
-        public int Offset { get; set; }
-    }
-}
diff --git a/src/Hqub.MusicBrainz/Entities/Collections/ReleaseList.cs b/src/Hqub.MusicBrainz/Entities/Collections/ReleaseList.cs
deleted file mode 100644
index cc9fd5a..0000000
--- a/src/Hqub.MusicBrainz/Entities/Collections/ReleaseList.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-
-namespace Hqub.MusicBrainz.Entities.Collections
-{
-    using System.Collections.Generic;
-    using System.Runtime.Serialization;
-
-    [DataContract]
-    class ReleaseList
-    {
-        [DataMember(Name = "count")]
-        public int Count { get; set; }
-
-        [DataMember(Name = "offset")]
-        public int Offset { get; set; }
-
-        [DataMember(Name = "releases")]
-        public List<Release> Items { get; set; }
-    }
-
-    [DataContract]
-    class ReleaseListBrowse
-    {
-        [DataMember(Name = "releases")]
-        public List<Release> Items { get; set; }
-
-        [DataMember(Name = "release-count")]
-        public int Count { get; set; }
-
-        [DataMember(Name = "release-offset")]
-        public int Offset { get; set; }
-    }
-}
diff --git a/src/Hqub.MusicBrainz/Services/ArtistService.cs b/src/Hqub.MusicBrainz/Services/ArtistService.cs
index e03fd0d..7533773 100644
--- a/src/Hqub.MusicBrainz/Services/ArtistService.cs
+++ b/src/Hqub.MusicBrainz/Services/ArtistService.cs
@@ -1,7 +1,6 @@
 namespace Hqub.MusicBrainz.Services
 {
     using Hqub.MusicBrainz.Entities;
-    using Hqub.MusicBrainz.Entities.Collections;
     using System;
     using System.Threading.Tasks;
 
diff --git a/src/Hqub.MusicBrainz/Services/BrowseRequest.cs b/src/Hqub.MusicBrainz/Services/BrowseRequest.cs
index c890d70..9c6e28b 100644
--- a/src/Hqub.MusicBrainz/Services/BrowseRequest.cs
+++ b/src/Hqub.MusicBrainz/Services/BrowseRequest.cs
@@ -1,7 +1,8 @@
 namespace Hqub.MusicBrainz.Services
 {
     using Hqub.MusicBrainz.Entities;
-    using Hqub.MusicBrainz.Entities.Collections;
+    using System.Collections.Generic;
+    using System.Runtime.Serialization;
     using System.Threading;
     using System.Threading.Tasks;
 
@@ -131,7 +132,20 @@ public async Task<QueryResult<T>> GetAsync(CancellationToken ct = default)
         public abstract override string ToString();
     }
 
-    #region Helper classes
+    #region Private implementation
+
+    [DataContract]
+    class ArtistListBrowse
+    {
+        [DataMember(Name = "artist-count")]
+        public int Count { get; set; }
+
+        [DataMember(Name = "artist-offset")]
+        public int Offset { get; set; }
+
+        [DataMember(Name = "artists")]
+        public List<Artist> Items { get; set; }
+    }
 
     class ArtistBrowseRequest : BrowseRequest<Artist>
     {
@@ -157,6 +171,19 @@ public override string ToString()
         }
     }
 
+    [DataContract]
+    class LabelListBrowse
+    {
+        [DataMember(Name = "label-count")]
+        public int Count { get; set; }
+
+        [DataMember(Name = "label-offset")]
+        public int Offset { get; set; }
+
+        [DataMember(Name = "labels")]
+        public List<Label> Items { get; set; }
+    }
+
     class LabelBrowseRequest : BrowseRequest<Label>
     {
         public LabelBrowseRequest(MusicBrainzClient client, UrlBuilder builder, string id, string relatedEntity, string entity)
@@ -181,6 +208,19 @@ public override string ToString()
         }
     }
 
+    [DataContract]
+    class RecordingListBrowse
+    {
+        [DataMember(Name = "recording-count")]
+        public int Count { get; set; }
+
+        [DataMember(Name = "recording-offset")]
+        public int Offset { get; set; }
+
+        [DataMember(Name = "recordings")]
+        public List<Recording> Items { get; set; }
+    }
+
     class RecordingBrowseRequest : BrowseRequest<Recording>
     {
         public RecordingBrowseRequest(MusicBrainzClient client, UrlBuilder builder, string id, string relatedEntity, string entity)
@@ -205,6 +245,19 @@ public override string ToString()
         }
     }
 
+    [DataContract]
+    class ReleaseGroupListBrowse
+    {
+        [DataMember(Name = "release-group-count")]
+        public int Count { get; set; }
+
+        [DataMember(Name = "release-group-offset")]
+        public int Offset { get; set; }
+
+        [DataMember(Name = "release-groups")]
+        public List<ReleaseGroup> Items { get; set; }
+    }
+
     class ReleaseGroupBrowseRequest : BrowseRequest<ReleaseGroup>
     {
         public ReleaseGroupBrowseRequest(MusicBrainzClient client, UrlBuilder builder, string id, string relatedEntity, string entity)
@@ -229,6 +282,19 @@ public override string ToString()
         }
     }
 
+    [DataContract]
+    class ReleaseListBrowse
+    {
+        [DataMember(Name = "release-count")]
+        public int Count { get; set; }
+
+        [DataMember(Name = "release-offset")]
+        public int Offset { get; set; }
+
+        [DataMember(Name = "releases")]
+        public List<Release> Items { get; set; }
+    }
+
     class ReleaseBrowseRequest : BrowseRequest<Release>
     {
         public ReleaseBrowseRequest(MusicBrainzClient client, UrlBuilder builder, string id, string relatedEntity, string entity)
diff --git a/src/Hqub.MusicBrainz/Services/LabelService.cs b/src/Hqub.MusicBrainz/Services/LabelService.cs
index baee614..d91d64a 100644
--- a/src/Hqub.MusicBrainz/Services/LabelService.cs
+++ b/src/Hqub.MusicBrainz/Services/LabelService.cs
@@ -1,7 +1,6 @@
 namespace Hqub.MusicBrainz.Services
 {
     using Hqub.MusicBrainz.Entities;
-    using Hqub.MusicBrainz.Entities.Collections;
     using System;
     using System.Threading.Tasks;
 
diff --git a/src/Hqub.MusicBrainz/Services/RecordingService.cs b/src/Hqub.MusicBrainz/Services/RecordingService.cs
index c08b7e1..296d09e 100644
--- a/src/Hqub.MusicBrainz/Services/RecordingService.cs
+++ b/src/Hqub.MusicBrainz/Services/RecordingService.cs
@@ -1,7 +1,6 @@
 namespace Hqub.MusicBrainz.Services
 {
     using Hqub.MusicBrainz.Entities;
-    using Hqub.MusicBrainz.Entities.Collections;
     using System;
     using System.Threading.Tasks;
 
diff --git a/src/Hqub.MusicBrainz/Services/ReleaseGroupService.cs b/src/Hqub.MusicBrainz/Services/ReleaseGroupService.cs
index 2ed4f2f..72fbb6c 100644
--- a/src/Hqub.MusicBrainz/Services/ReleaseGroupService.cs
+++ b/src/Hqub.MusicBrainz/Services/ReleaseGroupService.cs
@@ -1,7 +1,6 @@
 namespace Hqub.MusicBrainz.Services
 {
     using Hqub.MusicBrainz.Entities;
-    using Hqub.MusicBrainz.Entities.Collections;
     using System;
     using System.Threading.Tasks;
 
diff --git a/src/Hqub.MusicBrainz/Services/ReleaseService.cs b/src/Hqub.MusicBrainz/Services/ReleaseService.cs
index 7f656cc..3fa9a24 100644
--- a/src/Hqub.MusicBrainz/Services/ReleaseService.cs
+++ b/src/Hqub.MusicBrainz/Services/ReleaseService.cs
@@ -1,7 +1,6 @@
 namespace Hqub.MusicBrainz.Services
 {
     using Hqub.MusicBrainz.Entities;
-    using Hqub.MusicBrainz.Entities.Collections;
     using System;
     using System.Threading.Tasks;
 
diff --git a/src/Hqub.MusicBrainz/Services/SearchRequest.cs b/src/Hqub.MusicBrainz/Services/SearchRequest.cs
index 33c050d..1c7e0a9 100644
--- a/src/Hqub.MusicBrainz/Services/SearchRequest.cs
+++ b/src/Hqub.MusicBrainz/Services/SearchRequest.cs
@@ -1,7 +1,8 @@
 namespace Hqub.MusicBrainz.Services
 {
     using Hqub.MusicBrainz.Entities;
-    using Hqub.MusicBrainz.Entities.Collections;
+    using System.Collections.Generic;
+    using System.Runtime.Serialization;
     using System.Threading;
     using System.Threading.Tasks;
 
@@ -93,7 +94,20 @@ public override string ToString()
         }
     }
 
-    #region Helper classes
+    #region Private implementation
+
+    [DataContract]
+    class ArtistList
+    {
+        [DataMember(Name = "count")]
+        public int Count { get; set; }
+
+        [DataMember(Name = "offset")]
+        public int Offset { get; set; }
+
+        [DataMember(Name = "artists")]
+        public List<Artist> Items { get; set; }
+    }
 
     class ArtistSearchRequest : SearchRequest<Artist>
     {
@@ -113,6 +127,19 @@ protected override async Task<QueryResult<Artist>> SearchAsync(MusicBrainzClient
         }
     }
 
+    [DataContract]
+    class LabelList
+    {
+        [DataMember(Name = "count")]
+        public int Count { get; set; }
+
+        [DataMember(Name = "offset")]
+        public int Offset { get; set; }
+
+        [DataMember(Name = "labels")]
+        public List<Label> Items { get; set; }
+    }
+
     class LabelSearchRequest : SearchRequest<Label>
     {
         public LabelSearchRequest(MusicBrainzClient client, UrlBuilder builder, string query, string entity)
@@ -131,6 +158,19 @@ protected override async Task<QueryResult<Label>> SearchAsync(MusicBrainzClient
         }
     }
 
+    [DataContract]
+    class RecordingList
+    {
+        [DataMember(Name = "count")]
+        public int Count { get; set; }
+
+        [DataMember(Name = "offset")]
+        public int Offset { get; set; }
+
+        [DataMember(Name = "recordings")]
+        public List<Recording> Items { get; set; }
+    }
+
     class RecordingSearchRequest : SearchRequest<Recording>
     {
         public RecordingSearchRequest(MusicBrainzClient client, UrlBuilder builder, string query, string entity)
@@ -149,6 +189,19 @@ protected override async Task<QueryResult<Recording>> SearchAsync(MusicBrainzCli
         }
     }
 
+    [DataContract]
+    class ReleaseGroupList
+    {
+        [DataMember(Name = "count")]
+        public int Count { get; set; }
+
+        [DataMember(Name = "offset")]
+        public int Offset { get; set; }
+
+        [DataMember(Name = "release-groups")]
+        public List<ReleaseGroup> Items { get; set; }
+    }
+
     class ReleaseGroupSearchRequest : SearchRequest<ReleaseGroup>
     {
         public ReleaseGroupSearchRequest(MusicBrainzClient client, UrlBuilder builder, string query, string entity)
@@ -167,6 +220,19 @@ protected override async Task<QueryResult<ReleaseGroup>> SearchAsync(MusicBrainz
         }
     }
 
+    [DataContract]
+    class ReleaseList
+    {
+        [DataMember(Name = "count")]
+        public int Count { get; set; }
+
+        [DataMember(Name = "offset")]
+        public int Offset { get; set; }
+
+        [DataMember(Name = "releases")]
+        public List<Release> Items { get; set; }
+    }
+
     class ReleaseSearchRequest : SearchRequest<Release>
     {
         public ReleaseSearchRequest(MusicBrainzClient client, UrlBuilder builder, string query, string entity)

From abe77fa52b2f858a7226e47fb4205822419fed5a Mon Sep 17 00:00:00 2001
From: wo80 <christian.woltering@tu-dortmund.de>
Date: Sat, 11 Oct 2025 11:44:03 +0200
Subject: [PATCH 6/8] Seal QueryResult class and make properties read-only.

---
 src/Hqub.MusicBrainz/QueryResult.cs           | 26 +++++++++++++------
 .../Services/ArtistService.cs                 |  4 +--
 .../Services/BrowseRequest.cs                 | 10 +++----
 src/Hqub.MusicBrainz/Services/LabelService.cs |  4 +--
 .../Services/RecordingService.cs              |  4 +--
 .../Services/ReleaseGroupService.cs           |  6 ++---
 .../Services/ReleaseService.cs                |  6 ++---
 .../Services/SearchRequest.cs                 | 10 +++----
 8 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/src/Hqub.MusicBrainz/QueryResult.cs b/src/Hqub.MusicBrainz/QueryResult.cs
index 36b7e5c..0b57453 100644
--- a/src/Hqub.MusicBrainz/QueryResult.cs
+++ b/src/Hqub.MusicBrainz/QueryResult.cs
@@ -5,12 +5,12 @@
 namespace Hqub.MusicBrainz
 {
     /// <summary>
-    /// Abstract base class for MusicBrainz queries returning lists (with paging support).
+    /// Base class for MusicBrainz queries returning lists (with paging support).
     /// </summary>
-    public class QueryResult<T> : IEnumerable<T> where T : IEntity
+    public sealed class QueryResult<T> : IEnumerable<T> where T : IEntity
     {
         /// <summary>
-        /// Gets or sets the total list items count.
+        /// Gets the total list items count.
         /// </summary>
         /// <remarks>
         /// This might be different form the actual list items count. If the list was
@@ -18,17 +18,27 @@ public class QueryResult<T> : IEnumerable<T> where T : IEntity
         /// of available items (on the server), while the number of returned items is
         /// limited by the requests 'limit' parameter (default = 25).
         /// </remarks>
-        public int Count { get; set; }
+        public int Count { get; }
 
         /// <summary>
-        /// Gets or sets the list offset (only available in search requests).
+        /// Gets the list offset (only available in search requests).
         /// </summary>
-        public int Offset { get; set; }
+        public int Offset { get; }
 
         /// <summary>
-        /// Gets or sets the list of entities.
+        /// Gets the list of entities.
         /// </summary>
-        public List<T> Items { get; set; }
+        public IReadOnlyList<T> Items { get; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="QueryResult{T}"/> class.
+        /// </summary>
+        public QueryResult(int count, int offset, List<T> list)
+        {
+            Count = count;
+            Offset = offset;
+            Items = list;
+        }
 
         /// <summary>
         /// Returns an enumerator that iterates through the collection.
diff --git a/src/Hqub.MusicBrainz/Services/ArtistService.cs b/src/Hqub.MusicBrainz/Services/ArtistService.cs
index 7533773..76a3ef9 100644
--- a/src/Hqub.MusicBrainz/Services/ArtistService.cs
+++ b/src/Hqub.MusicBrainz/Services/ArtistService.cs
@@ -72,7 +72,7 @@ public async Task<QueryResult<Artist>> SearchAsync(string query, int limit = 25,
 
             var list = await client.GetAsync<ArtistList>(url);
 
-            return new QueryResult<Artist>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+            return new QueryResult<Artist>(list.Count, list.Offset, list.Items);
         }
 
         /// <inheritdoc />
@@ -88,7 +88,7 @@ public async Task<QueryResult<Artist>> BrowseAsync(string entity, string id, int
 
             var list = await client.GetAsync<ArtistListBrowse>(url);
 
-            return new QueryResult<Artist>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+            return new QueryResult<Artist>(list.Count, list.Offset, list.Items);
         }
 
         #endregion
diff --git a/src/Hqub.MusicBrainz/Services/BrowseRequest.cs b/src/Hqub.MusicBrainz/Services/BrowseRequest.cs
index 9c6e28b..17b75a0 100644
--- a/src/Hqub.MusicBrainz/Services/BrowseRequest.cs
+++ b/src/Hqub.MusicBrainz/Services/BrowseRequest.cs
@@ -161,7 +161,7 @@ protected override async Task<QueryResult<Artist>> BrowseAsync(MusicBrainzClient
 
             var list = await client.GetAsync<ArtistListBrowse>(url, ct);
 
-            return new QueryResult<Artist>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+            return new QueryResult<Artist>(list.Count, list.Offset, list.Items);
         }
 
         /// <inheritdoc />
@@ -198,7 +198,7 @@ protected override async Task<QueryResult<Label>> BrowseAsync(MusicBrainzClient
 
             var list = await client.GetAsync<LabelListBrowse>(url, ct);
 
-            return new QueryResult<Label>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+            return new QueryResult<Label>(list.Count, list.Offset, list.Items);
         }
 
         /// <inheritdoc />
@@ -235,7 +235,7 @@ protected override async Task<QueryResult<Recording>> BrowseAsync(MusicBrainzCli
 
             var list = await client.GetAsync<RecordingListBrowse>(url, ct);
 
-            return new QueryResult<Recording>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+            return new QueryResult<Recording>(list.Count, list.Offset, list.Items);
         }
 
         /// <inheritdoc />
@@ -272,7 +272,7 @@ protected override async Task<QueryResult<ReleaseGroup>> BrowseAsync(MusicBrainz
 
             var list = await client.GetAsync<ReleaseGroupListBrowse>(url, ct);
 
-            return new QueryResult<ReleaseGroup>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+            return new QueryResult<ReleaseGroup>(list.Count, list.Offset, list.Items);
         }
 
         /// <inheritdoc />
@@ -309,7 +309,7 @@ protected override async Task<QueryResult<Release>> BrowseAsync(MusicBrainzClien
 
             var list = await client.GetAsync<ReleaseListBrowse>(url, ct);
 
-            return new QueryResult<Release>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+            return new QueryResult<Release>(list.Count, list.Offset, list.Items);
         }
 
         /// <inheritdoc />
diff --git a/src/Hqub.MusicBrainz/Services/LabelService.cs b/src/Hqub.MusicBrainz/Services/LabelService.cs
index d91d64a..dba048b 100644
--- a/src/Hqub.MusicBrainz/Services/LabelService.cs
+++ b/src/Hqub.MusicBrainz/Services/LabelService.cs
@@ -72,7 +72,7 @@ public async Task<QueryResult<Label>> SearchAsync(string query, int limit = 25,
 
             var list = await client.GetAsync<LabelList>(url);
 
-            return new QueryResult<Label>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+            return new QueryResult<Label>(list.Count, list.Offset, list.Items);
         }
 
         /// <inheritdoc />
@@ -88,7 +88,7 @@ public async Task<QueryResult<Label>> BrowseAsync(string entity, string id, int
 
             var list = await client.GetAsync<LabelListBrowse>(url);
 
-            return new QueryResult<Label>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+            return new QueryResult<Label>(list.Count, list.Offset, list.Items);
         }
 
         #endregion
diff --git a/src/Hqub.MusicBrainz/Services/RecordingService.cs b/src/Hqub.MusicBrainz/Services/RecordingService.cs
index 296d09e..140a8ba 100644
--- a/src/Hqub.MusicBrainz/Services/RecordingService.cs
+++ b/src/Hqub.MusicBrainz/Services/RecordingService.cs
@@ -72,7 +72,7 @@ public async Task<QueryResult<Recording>> SearchAsync(string query, int limit =
 
             var list = await client.GetAsync<RecordingList>(url);
 
-            return new QueryResult<Recording>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+            return new QueryResult<Recording>(list.Count, list.Offset, list.Items);
         }
 
         /// <inheritdoc />
@@ -88,7 +88,7 @@ public async Task<QueryResult<Recording>> BrowseAsync(string entity, string id,
 
             var list = await client.GetAsync<RecordingListBrowse>(url);
 
-            return new QueryResult<Recording>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+            return new QueryResult<Recording>(list.Count, list.Offset, list.Items);
         }
 
         #endregion
diff --git a/src/Hqub.MusicBrainz/Services/ReleaseGroupService.cs b/src/Hqub.MusicBrainz/Services/ReleaseGroupService.cs
index 72fbb6c..34acd17 100644
--- a/src/Hqub.MusicBrainz/Services/ReleaseGroupService.cs
+++ b/src/Hqub.MusicBrainz/Services/ReleaseGroupService.cs
@@ -72,7 +72,7 @@ public async Task<QueryResult<ReleaseGroup>> SearchAsync(string query, int limit
 
             var list = await client.GetAsync<ReleaseGroupList>(url);
 
-            return new QueryResult<ReleaseGroup>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+            return new QueryResult<ReleaseGroup>(list.Count, list.Offset, list.Items);
         }
 
         /// <inheritdoc />
@@ -88,7 +88,7 @@ public async Task<QueryResult<ReleaseGroup>> BrowseAsync(string entity, string i
 
             var list = await client.GetAsync<ReleaseGroupListBrowse>(url);
 
-            return new QueryResult<ReleaseGroup>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+            return new QueryResult<ReleaseGroup>(list.Count, list.Offset, list.Items);
         }
 
         /// <inheritdoc />
@@ -98,7 +98,7 @@ public async Task<QueryResult<ReleaseGroup>> BrowseAsync(string entity, string i
 
             var list = await client.GetAsync<ReleaseGroupListBrowse>(url);
 
-            return new QueryResult<ReleaseGroup>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+            return new QueryResult<ReleaseGroup>(list.Count, list.Offset, list.Items);
         }
 
         #endregion
diff --git a/src/Hqub.MusicBrainz/Services/ReleaseService.cs b/src/Hqub.MusicBrainz/Services/ReleaseService.cs
index 3fa9a24..879c58e 100644
--- a/src/Hqub.MusicBrainz/Services/ReleaseService.cs
+++ b/src/Hqub.MusicBrainz/Services/ReleaseService.cs
@@ -72,7 +72,7 @@ public async Task<QueryResult<Release>> SearchAsync(string query, int limit = 25
 
             var list = await client.GetAsync<ReleaseList>(url);
 
-            return new QueryResult<Release>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+            return new QueryResult<Release>(list.Count, list.Offset, list.Items);
         }
 
         /// <inheritdoc />
@@ -89,7 +89,7 @@ public async Task<QueryResult<Release>> BrowseAsync(string entity, string id, in
 
             var list = await client.GetAsync<ReleaseListBrowse>(url);
 
-            return new QueryResult<Release>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+            return new QueryResult<Release>(list.Count, list.Offset, list.Items);
         }
 
         /// <inheritdoc />
@@ -99,7 +99,7 @@ public async Task<QueryResult<Release>> BrowseAsync(string entity, string id, st
 
             var list = await client.GetAsync<ReleaseListBrowse>(url);
 
-            return new QueryResult<Release>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+            return new QueryResult<Release>(list.Count, list.Offset, list.Items);
         }
 
         #endregion
diff --git a/src/Hqub.MusicBrainz/Services/SearchRequest.cs b/src/Hqub.MusicBrainz/Services/SearchRequest.cs
index 1c7e0a9..870d6fa 100644
--- a/src/Hqub.MusicBrainz/Services/SearchRequest.cs
+++ b/src/Hqub.MusicBrainz/Services/SearchRequest.cs
@@ -123,7 +123,7 @@ protected override async Task<QueryResult<Artist>> SearchAsync(MusicBrainzClient
 
             var list = await client.GetAsync<ArtistList>(url, ct);
 
-            return new QueryResult<Artist>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+            return new QueryResult<Artist>(list.Count, list.Offset, list.Items);
         }
     }
 
@@ -154,7 +154,7 @@ protected override async Task<QueryResult<Label>> SearchAsync(MusicBrainzClient
 
             var list = await client.GetAsync<LabelList>(url, ct);
 
-            return new QueryResult<Label>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+            return new QueryResult<Label>(list.Count, list.Offset, list.Items);
         }
     }
 
@@ -185,7 +185,7 @@ protected override async Task<QueryResult<Recording>> SearchAsync(MusicBrainzCli
 
             var list = await client.GetAsync<RecordingList>(url, ct);
 
-            return new QueryResult<Recording>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+            return new QueryResult<Recording>(list.Count, list.Offset, list.Items);
         }
     }
 
@@ -216,7 +216,7 @@ protected override async Task<QueryResult<ReleaseGroup>> SearchAsync(MusicBrainz
 
             var list = await client.GetAsync<ReleaseGroupList>(url, ct);
 
-            return new QueryResult<ReleaseGroup>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+            return new QueryResult<ReleaseGroup>(list.Count, list.Offset, list.Items);
         }
     }
 
@@ -247,7 +247,7 @@ protected override async Task<QueryResult<Release>> SearchAsync(MusicBrainzClien
 
             var list = await client.GetAsync<ReleaseList>(url, ct);
 
-            return new QueryResult<Release>() { Items = list.Items, Count = list.Count, Offset = list.Offset };
+            return new QueryResult<Release>(list.Count, list.Offset, list.Items);
         }
     }
 

From aae24cadf6672048d359fa9ffbc9118c0200a78a Mon Sep 17 00:00:00 2001
From: wo80 <christian.woltering@tu-dortmund.de>
Date: Sat, 11 Oct 2025 14:25:40 +0200
Subject: [PATCH 7/8] Update documentation.

---
 src/Hqub.MusicBrainz/QueryParameters.cs         |  2 +-
 src/Hqub.MusicBrainz/QueryResult.cs             | 16 ++++++++--------
 src/Hqub.MusicBrainz/Services/IBrowseService.cs |  3 ++-
 src/Hqub.MusicBrainz/Services/ILookupService.cs |  3 ++-
 src/Hqub.MusicBrainz/Services/ISearchService.cs |  3 ++-
 src/Hqub.MusicBrainz/Services/LookupRequest.cs  |  2 +-
 src/Hqub.MusicBrainz/Services/SearchRequest.cs  |  2 +-
 7 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/Hqub.MusicBrainz/QueryParameters.cs b/src/Hqub.MusicBrainz/QueryParameters.cs
index eabc266..4af7212 100644
--- a/src/Hqub.MusicBrainz/QueryParameters.cs
+++ b/src/Hqub.MusicBrainz/QueryParameters.cs
@@ -10,7 +10,7 @@ namespace Hqub.MusicBrainz
     /// <summary>
     /// Helper for building MusicBrainz query strings.
     /// </summary>
-    /// <typeparam name="T">The entity type to search for.</typeparam>
+    /// <typeparam name="T">Any supported MusicBrainz entity implementing the <see cref="IEntity"/> interface.</typeparam>
     /// <remarks>
     /// See https://musicbrainz.org/doc/Development/XML_Web_Service/Version_2/Search
     /// </remarks>
diff --git a/src/Hqub.MusicBrainz/QueryResult.cs b/src/Hqub.MusicBrainz/QueryResult.cs
index 0b57453..a2a40a2 100644
--- a/src/Hqub.MusicBrainz/QueryResult.cs
+++ b/src/Hqub.MusicBrainz/QueryResult.cs
@@ -5,23 +5,24 @@
 namespace Hqub.MusicBrainz
 {
     /// <summary>
-    /// Base class for MusicBrainz queries returning lists (with paging support).
+    /// Query result representing collections of MusicBrainz entities returned by search or browse requests.
     /// </summary>
+    /// <typeparam name="T">Any supported MusicBrainz entity implementing the <see cref="IEntity"/> interface.</typeparam>
     public sealed class QueryResult<T> : IEnumerable<T> where T : IEntity
     {
         /// <summary>
-        /// Gets the total list items count.
+        /// Gets the total number of items available.
         /// </summary>
         /// <remarks>
-        /// This might be different form the actual list items count. If the list was
-        /// generated from a search request, this property will return the total number
-        /// of available items (on the server), while the number of returned items is
-        /// limited by the requests 'limit' parameter (default = 25).
+        /// This might be different from the count of <see cref="QueryResult{T}.Items"/>. If the
+        /// list was generated by a request that requires paging, this property will return the
+        /// total number of matching items in the database, while the number of returned items
+        /// is limited by the requests <c>limit</c> parameter.
         /// </remarks>
         public int Count { get; }
 
         /// <summary>
-        /// Gets the list offset (only available in search requests).
+        /// Gets the list offset used for paging.
         /// </summary>
         public int Offset { get; }
 
@@ -49,7 +50,6 @@ public IEnumerator<T> GetEnumerator()
             return Items.GetEnumerator();
         }
 
-
         IEnumerator IEnumerable.GetEnumerator()
         {
             return GetEnumerator();
diff --git a/src/Hqub.MusicBrainz/Services/IBrowseService.cs b/src/Hqub.MusicBrainz/Services/IBrowseService.cs
index 0ef7148..0979087 100644
--- a/src/Hqub.MusicBrainz/Services/IBrowseService.cs
+++ b/src/Hqub.MusicBrainz/Services/IBrowseService.cs
@@ -4,8 +4,9 @@
     using System.Threading.Tasks;
 
     /// <summary>
-    /// Interface defining the entity service.
+    /// Interface defining the browse service.
     /// </summary>
+    /// <typeparam name="T">Any supported MusicBrainz entity implementing the <see cref="IEntity"/> interface.</typeparam>
     public interface IBrowseService<T> where T : IEntity
     {
         /// <summary>
diff --git a/src/Hqub.MusicBrainz/Services/ILookupService.cs b/src/Hqub.MusicBrainz/Services/ILookupService.cs
index f0164f9..2f33e6b 100644
--- a/src/Hqub.MusicBrainz/Services/ILookupService.cs
+++ b/src/Hqub.MusicBrainz/Services/ILookupService.cs
@@ -4,8 +4,9 @@
     using System.Threading.Tasks;
 
     /// <summary>
-    /// Interface defining the entity lookup service.
+    /// Interface defining the lookup service.
     /// </summary>
+    /// <typeparam name="T">Any supported MusicBrainz entity implementing the <see cref="IEntity"/> interface.</typeparam>
     public interface ILookupService<T> where T : IEntity
     {
         /// <summary>
diff --git a/src/Hqub.MusicBrainz/Services/ISearchService.cs b/src/Hqub.MusicBrainz/Services/ISearchService.cs
index ba9b00d..ac62700 100644
--- a/src/Hqub.MusicBrainz/Services/ISearchService.cs
+++ b/src/Hqub.MusicBrainz/Services/ISearchService.cs
@@ -4,8 +4,9 @@
     using System.Threading.Tasks;
 
     /// <summary>
-    /// Interface defining the entity service.
+    /// Interface defining the search service.
     /// </summary>
+    /// <typeparam name="T">Any supported MusicBrainz entity implementing the <see cref="IEntity"/> interface.</typeparam>
     public interface ISearchService<T> where T : IEntity
     {
         /// <summary>
diff --git a/src/Hqub.MusicBrainz/Services/LookupRequest.cs b/src/Hqub.MusicBrainz/Services/LookupRequest.cs
index a3ac91b..a796214 100644
--- a/src/Hqub.MusicBrainz/Services/LookupRequest.cs
+++ b/src/Hqub.MusicBrainz/Services/LookupRequest.cs
@@ -8,7 +8,7 @@
     /// <summary>
     /// Prepare a lookup request to the MusicBrainz web service.
     /// </summary>
-    /// <typeparam name="T">Any supported MusicBrainz entity.</typeparam>
+    /// <typeparam name="T">Any supported MusicBrainz entity implementing the <see cref="IEntity"/> interface.</typeparam>
     public class LookupRequest<T> where T : IEntity
     {
         private readonly string EntityName;
diff --git a/src/Hqub.MusicBrainz/Services/SearchRequest.cs b/src/Hqub.MusicBrainz/Services/SearchRequest.cs
index 870d6fa..87c8130 100644
--- a/src/Hqub.MusicBrainz/Services/SearchRequest.cs
+++ b/src/Hqub.MusicBrainz/Services/SearchRequest.cs
@@ -9,7 +9,7 @@
     /// <summary>
     /// Prepare a search request to the MusicBrainz web service.
     /// </summary>
-    /// <typeparam name="T">Any supported MusicBrainz entity.</typeparam>
+    /// <typeparam name="T">Any supported MusicBrainz entity implementing the <see cref="IEntity"/> interface.</typeparam>
     public abstract class SearchRequest<T> where T : IEntity
     {
         private readonly MusicBrainzClient client;

From 107677a1aa233282bc85135d6a268322ec49a6e1 Mon Sep 17 00:00:00 2001
From: wo80 <christian.woltering@tu-dortmund.de>
Date: Sat, 11 Oct 2025 14:34:27 +0200
Subject: [PATCH 8/8] Remove unused IWorkService.

---
 src/Hqub.MusicBrainz/MusicBrainzClient.cs     |  2 +-
 src/Hqub.MusicBrainz/Services/IWorkService.cs | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)
 delete mode 100644 src/Hqub.MusicBrainz/Services/IWorkService.cs

diff --git a/src/Hqub.MusicBrainz/MusicBrainzClient.cs b/src/Hqub.MusicBrainz/MusicBrainzClient.cs
index 7e4b0b1..1153894 100644
--- a/src/Hqub.MusicBrainz/MusicBrainzClient.cs
+++ b/src/Hqub.MusicBrainz/MusicBrainzClient.cs
@@ -52,7 +52,7 @@ public sealed class MusicBrainzClient : IDisposable
         public IReleaseGroupService ReleaseGroups { get; }
 
         /// <summary>
-        /// Gets the work entity service.
+        /// Gets the work entity lookup service.
         /// </summary>
         public ILookupService<Work> Work { get; }
 
diff --git a/src/Hqub.MusicBrainz/Services/IWorkService.cs b/src/Hqub.MusicBrainz/Services/IWorkService.cs
deleted file mode 100644
index 881581c..0000000
--- a/src/Hqub.MusicBrainz/Services/IWorkService.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace Hqub.MusicBrainz.Services
-{
-    using Hqub.MusicBrainz.Entities;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// Interface defining the work service.
-    /// </summary>
-    public interface IWorkService : ILookupService<Work>
-    {
-    }
-}