diff --git a/src/Hqub.MusicBrainz.Client/Example6.cs b/src/Hqub.MusicBrainz.Client/Example6.cs
index fdcde91..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;
 
@@ -89,7 +88,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 +97,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/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/Collections/ArtistList.cs b/src/Hqub.MusicBrainz/Entities/Collections/ArtistList.cs
deleted file mode 100644
index 9fb6468..0000000
--- a/src/Hqub.MusicBrainz/Entities/Collections/ArtistList.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-
-namespace Hqub.MusicBrainz.Entities.Collections
-{
-    using System.Collections.Generic;
-    using System.Runtime.Serialization;
-
-    /// <summary>
-    /// List of artists returned by MusicBrainz search requests.
-    /// </summary>
-    [DataContract]
-    public class ArtistList : QueryResult<Artist>
-    {
-        /// <summary>
-        /// Gets or sets the list of artists.
-        /// </summary>
-        [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
-    {
-        /// <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
deleted file mode 100644
index de7a766..0000000
--- a/src/Hqub.MusicBrainz/Entities/Collections/LabelList.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-
-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>
-    {
-        /// <summary>
-        /// Gets or sets the list of labels.
-        /// </summary>
-        [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
-    {
-        /// <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
deleted file mode 100644
index 0e7d93b..0000000
--- a/src/Hqub.MusicBrainz/Entities/Collections/RecordingList.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-
-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>
-    {
-        /// <summary>
-        /// Gets or sets the list of artists.
-        /// </summary>
-        [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
-    {
-        /// <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
deleted file mode 100644
index e66ea20..0000000
--- a/src/Hqub.MusicBrainz/Entities/Collections/ReleaseGroupList.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-
-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>
-    {
-        /// <summary>
-        /// Gets or sets the list of artists.
-        /// </summary>
-        [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
-    {
-        /// <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
deleted file mode 100644
index b4f632e..0000000
--- a/src/Hqub.MusicBrainz/Entities/Collections/ReleaseList.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-
-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>
-    {
-        /// <summary>
-        /// Gets or sets the list of artists.
-        /// </summary>
-        [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
-    {
-        /// <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/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/MusicBrainzClient.cs b/src/Hqub.MusicBrainz/MusicBrainzClient.cs
index e4cf015..1153894 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;
@@ -51,9 +52,9 @@ public sealed class MusicBrainzClient : IDisposable
         public IReleaseGroupService ReleaseGroups { get; }
 
         /// <summary>
-        /// Gets the work entity service.
+        /// Gets the work entity lookup 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/QueryParameters.cs b/src/Hqub.MusicBrainz/QueryParameters.cs
index 7dcb114..4af7212 100644
--- a/src/Hqub.MusicBrainz/QueryParameters.cs
+++ b/src/Hqub.MusicBrainz/QueryParameters.cs
@@ -10,11 +10,12 @@ 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>
     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 80d9a8e..a2a40a2 100644
--- a/src/Hqub.MusicBrainz/QueryResult.cs
+++ b/src/Hqub.MusicBrainz/QueryResult.cs
@@ -1,38 +1,54 @@
-using System.Collections;
+using Hqub.MusicBrainz.Entities;
+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).
+    /// Query result representing collections of MusicBrainz entities returned by search or browse requests.
     /// </summary>
-    [DataContract]
-    public abstract class QueryResult<T> : IEnumerable<T>
+    /// <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 or sets 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>
-        [DataMember(Name = "count")]
-        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 used for paging.
         /// </summary>
-        [DataMember(Name = "offset")]
-        public int Offset { get; set; }
+        public int Offset { get; }
+
+        /// <summary>
+        /// Gets the list of entities.
+        /// </summary>
+        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.
         /// </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..76a3ef9 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;
 
@@ -27,19 +26,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 +61,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 +70,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>(list.Count, list.Offset, list.Items);
         }
 
         /// <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>(list.Count, list.Offset, list.Items);
         }
 
         #endregion
diff --git a/src/Hqub.MusicBrainz/Services/BrowseRequest.cs b/src/Hqub.MusicBrainz/Services/BrowseRequest.cs
index 858a0ee..17b75a0 100644
--- a/src/Hqub.MusicBrainz/Services/BrowseRequest.cs
+++ b/src/Hqub.MusicBrainz/Services/BrowseRequest.cs
@@ -1,6 +1,8 @@
 namespace Hqub.MusicBrainz.Services
 {
-    using Hqub.MusicBrainz.Entities.Collections;
+    using Hqub.MusicBrainz.Entities;
+    using System.Collections.Generic;
+    using System.Runtime.Serialization;
     using System.Threading;
     using System.Threading.Tasks;
 
@@ -8,7 +10,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;
 
@@ -114,7 +116,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 +124,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.
@@ -130,9 +132,22 @@ public async Task<T> GetAsync(CancellationToken ct = default)
         public abstract override string ToString();
     }
 
-    #region Helper classes
+    #region Private implementation
 
-    class ArtistBrowseRequest : BrowseRequest<ArtistList>
+    [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>
     {
         public ArtistBrowseRequest(MusicBrainzClient client, UrlBuilder builder, string id, string relatedEntity, string entity)
             : base(client, builder, id, relatedEntity, entity)
@@ -140,13 +155,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>(list.Count, list.Offset, list.Items);
         }
 
         /// <inheritdoc />
@@ -156,7 +171,20 @@ public override string ToString()
         }
     }
 
-    class LabelBrowseRequest : BrowseRequest<LabelList>
+    [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)
             : base(client, builder, id, relatedEntity, entity)
@@ -164,13 +192,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>(list.Count, list.Offset, list.Items);
         }
 
         /// <inheritdoc />
@@ -180,7 +208,20 @@ public override string ToString()
         }
     }
 
-    class RecordingBrowseRequest : BrowseRequest<RecordingList>
+    [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)
             : base(client, builder, id, relatedEntity, entity)
@@ -188,13 +229,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>(list.Count, list.Offset, list.Items);
         }
 
         /// <inheritdoc />
@@ -204,7 +245,20 @@ public override string ToString()
         }
     }
 
-    class ReleaseGroupBrowseRequest : BrowseRequest<ReleaseGroupList>
+    [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)
             : base(client, builder, id, relatedEntity, entity)
@@ -212,13 +266,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>(list.Count, list.Offset, list.Items);
         }
 
         /// <inheritdoc />
@@ -228,7 +282,20 @@ public override string ToString()
         }
     }
 
-    class ReleaseBrowseRequest : BrowseRequest<ReleaseList>
+    [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)
             : base(client, builder, id, relatedEntity, entity)
@@ -236,13 +303,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>(list.Count, list.Offset, list.Items);
         }
 
         /// <inheritdoc />
diff --git a/src/Hqub.MusicBrainz/Services/IArtistService.cs b/src/Hqub.MusicBrainz/Services/IArtistService.cs
index 71503c4..9d5f939 100644
--- a/src/Hqub.MusicBrainz/Services/IArtistService.cs
+++ b/src/Hqub.MusicBrainz/Services/IArtistService.cs
@@ -1,86 +1,11 @@
 namespace Hqub.MusicBrainz.Services
 {
     using Hqub.MusicBrainz.Entities;
-    using Hqub.MusicBrainz.Entities.Collections;
-    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<ArtistList> 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<ArtistList> 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<ArtistList> 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<ArtistList> 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<ArtistList> 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<ArtistList> 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..0979087
--- /dev/null
+++ b/src/Hqub.MusicBrainz/Services/IBrowseService.cs
@@ -0,0 +1,34 @@
+namespace Hqub.MusicBrainz.Services
+{
+    using Hqub.MusicBrainz.Entities;
+    using System.Threading.Tasks;
+
+    /// <summary>
+    /// 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>
+        /// 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 7ff33fc..2ceda3a 100644
--- a/src/Hqub.MusicBrainz/Services/ILabelService.cs
+++ b/src/Hqub.MusicBrainz/Services/ILabelService.cs
@@ -1,86 +1,11 @@
 namespace Hqub.MusicBrainz.Services
 {
     using Hqub.MusicBrainz.Entities;
-    using Hqub.MusicBrainz.Entities.Collections;
-    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<LabelList> 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<LabelList> 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<LabelList> 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<LabelList> 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<LabelList> 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<LabelList> 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..2f33e6b
--- /dev/null
+++ b/src/Hqub.MusicBrainz/Services/ILookupService.cs
@@ -0,0 +1,28 @@
+namespace Hqub.MusicBrainz.Services
+{
+    using Hqub.MusicBrainz.Entities;
+    using System.Threading.Tasks;
+
+    /// <summary>
+    /// 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>
+        /// 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 1cecc77..483de36 100644
--- a/src/Hqub.MusicBrainz/Services/IRecordingService.cs
+++ b/src/Hqub.MusicBrainz/Services/IRecordingService.cs
@@ -1,86 +1,11 @@
 namespace Hqub.MusicBrainz.Services
 {
     using Hqub.MusicBrainz.Entities;
-    using Hqub.MusicBrainz.Entities.Collections;
-    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<RecordingList> 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<RecordingList> Search(QueryParameters<Artist> 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<RecordingList> 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<RecordingList> 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<RecordingList> 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<RecordingList> 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..6a1e4d1 100644
--- a/src/Hqub.MusicBrainz/Services/IReleaseGroupService.cs
+++ b/src/Hqub.MusicBrainz/Services/IReleaseGroupService.cs
@@ -1,88 +1,13 @@
 namespace Hqub.MusicBrainz.Services
 {
     using Hqub.MusicBrainz.Entities;
-    using Hqub.MusicBrainz.Entities.Collections;
     using System.Threading.Tasks;
 
     /// <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<ReleaseGroupList> 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<ReleaseGroupList> Search(QueryParameters<Artist> 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<ReleaseGroupList> 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<ReleaseGroupList> 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<ReleaseGroupList> 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<ReleaseGroupList> 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>
@@ -96,6 +21,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..59e575d 100644
--- a/src/Hqub.MusicBrainz/Services/IReleaseService.cs
+++ b/src/Hqub.MusicBrainz/Services/IReleaseService.cs
@@ -1,89 +1,13 @@
 namespace Hqub.MusicBrainz.Services
 {
     using Hqub.MusicBrainz.Entities;
-    using Hqub.MusicBrainz.Entities.Collections;
     using System.Threading.Tasks;
 
     /// <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<ReleaseList> 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<ReleaseList> Search(QueryParameters<Artist> 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<ReleaseList> 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<ReleaseList> 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<ReleaseList> 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<ReleaseList> 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>
@@ -98,7 +22,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/ISearchService.cs b/src/Hqub.MusicBrainz/Services/ISearchService.cs
new file mode 100644
index 0000000..ac62700
--- /dev/null
+++ b/src/Hqub.MusicBrainz/Services/ISearchService.cs
@@ -0,0 +1,48 @@
+namespace Hqub.MusicBrainz.Services
+{
+    using Hqub.MusicBrainz.Entities;
+    using System.Threading.Tasks;
+
+    /// <summary>
+    /// 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>
+        /// 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
deleted file mode 100644
index 664bdc5..0000000
--- a/src/Hqub.MusicBrainz/Services/IWorkService.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-namespace Hqub.MusicBrainz.Services
-{
-    using Hqub.MusicBrainz.Entities;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// Interface defining the work service.
-    /// </summary>
-    public interface IWorkService
-    {
-        /// <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);
-    }
-}
diff --git a/src/Hqub.MusicBrainz/Services/LabelService.cs b/src/Hqub.MusicBrainz/Services/LabelService.cs
index e6fbf3e..dba048b 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;
 
@@ -27,19 +26,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 +61,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 +70,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>(list.Count, list.Offset, list.Items);
         }
 
         /// <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>(list.Count, list.Offset, list.Items);
         }
 
         #endregion
diff --git a/src/Hqub.MusicBrainz/Services/LookupRequest.cs b/src/Hqub.MusicBrainz/Services/LookupRequest.cs
index 51b6d53..a796214 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;
@@ -7,8 +8,8 @@
     /// <summary>
     /// Prepare a lookup request to the MusicBrainz web service.
     /// </summary>
-    /// <typeparam name="T">Any supported MusicBrainz entity.</typeparam>
-    public class LookupRequest<T>
+    /// <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/LookupService.cs b/src/Hqub.MusicBrainz/Services/LookupService.cs
new file mode 100644
index 0000000..c32ccd5
--- /dev/null
+++ b/src/Hqub.MusicBrainz/Services/LookupService.cs
@@ -0,0 +1,53 @@
+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> where T : IEntity
+    {
+
+        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/RecordingService.cs b/src/Hqub.MusicBrainz/Services/RecordingService.cs
index 45a4c3c..140a8ba 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;
 
@@ -27,19 +26,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 +61,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 +70,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>(list.Count, list.Offset, list.Items);
         }
 
         /// <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>(list.Count, list.Offset, list.Items);
         }
 
         #endregion
diff --git a/src/Hqub.MusicBrainz/Services/ReleaseGroupService.cs b/src/Hqub.MusicBrainz/Services/ReleaseGroupService.cs
index 3a53fc4..34acd17 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;
 
@@ -27,19 +26,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 +61,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 +70,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>(list.Count, list.Offset, list.Items);
         }
 
         /// <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>(list.Count, list.Offset, list.Items);
         }
 
         /// <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>(list.Count, list.Offset, list.Items);
         }
 
         #endregion
diff --git a/src/Hqub.MusicBrainz/Services/ReleaseService.cs b/src/Hqub.MusicBrainz/Services/ReleaseService.cs
index 7ffb135..879c58e 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;
 
@@ -27,19 +26,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 +61,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 +70,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>(list.Count, list.Offset, list.Items);
         }
 
         /// <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>(list.Count, list.Offset, list.Items);
         }
 
         /// <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>(list.Count, list.Offset, list.Items);
         }
 
         #endregion
diff --git a/src/Hqub.MusicBrainz/Services/SearchRequest.cs b/src/Hqub.MusicBrainz/Services/SearchRequest.cs
index cfbb3b6..87c8130 100644
--- a/src/Hqub.MusicBrainz/Services/SearchRequest.cs
+++ b/src/Hqub.MusicBrainz/Services/SearchRequest.cs
@@ -1,23 +1,32 @@
 namespace Hqub.MusicBrainz.Services
 {
-    using System;
+    using Hqub.MusicBrainz.Entities;
+    using System.Collections.Generic;
+    using System.Runtime.Serialization;
     using System.Threading;
     using System.Threading.Tasks;
 
     /// <summary>
     /// Prepare a search request to the MusicBrainz web service.
     /// </summary>
-    /// <typeparam name="T">Any supported MusicBrainz entity.</typeparam>
-    public class SearchRequest<T>
+    /// <typeparam name="T">Any supported MusicBrainz entity implementing the <see cref="IEntity"/> interface.</typeparam>
+    public abstract class SearchRequest<T> where T : IEntity
     {
-        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 +75,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 +93,163 @@ public override string ToString()
             return builder.CreateSearchUrl(EntityName, query, limit, offset);
         }
     }
+
+    #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>
+    {
+        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>(list.Count, list.Offset, list.Items);
+        }
+    }
+
+    [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)
+            : 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>(list.Count, list.Offset, list.Items);
+        }
+    }
+
+    [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)
+            : 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>(list.Count, list.Offset, list.Items);
+        }
+    }
+
+    [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)
+            : 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>(list.Count, list.Offset, list.Items);
+        }
+    }
+
+    [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)
+            : 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>(list.Count, list.Offset, list.Items);
+        }
+    }
+
+    #endregion
 }
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
-    }
-}