diff --git a/.gitignore b/.gitignore
index 389b389..a5834e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,4 +33,6 @@ test-results*/
 .idea/*
 
 packages/*
-!packages/repositories.config
\ No newline at end of file
+!packages/repositories.config
+.vs
+TestResults
diff --git a/OsmSharp.IO.API.Tests/NonAuthTests.cs b/OsmSharp.IO.API.Tests/NonAuthTests.cs
index a1417da..c1d63e9 100644
--- a/OsmSharp.IO.API.Tests/NonAuthTests.cs
+++ b/OsmSharp.IO.API.Tests/NonAuthTests.cs
@@ -213,7 +213,7 @@ public void TestToStringCulture()
             const string doubleString = "-77.06719208";
 
             var cultures = CultureInfo.GetCultures(CultureTypes.AllCultures);
-            var clientAsChild = client as NonAuthClient;
+            var clientAsChild = client as OsmClient;
 
             foreach (var culture in cultures)
             {
diff --git a/OsmSharp.IO.API.Tests/BasicAuthClientTests.cs b/OsmSharp.IO.API.Tests/OAuth2ClientTests.cs
similarity index 92%
rename from OsmSharp.IO.API.Tests/BasicAuthClientTests.cs
rename to OsmSharp.IO.API.Tests/OAuth2ClientTests.cs
index a87ac93..a9de3e8 100644
--- a/OsmSharp.IO.API.Tests/BasicAuthClientTests.cs
+++ b/OsmSharp.IO.API.Tests/OAuth2ClientTests.cs
@@ -3,7 +3,6 @@
 using OsmSharp.API;
 using OsmSharp.Changesets;
 using OsmSharp.Tags;
-using System;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
@@ -12,8 +11,7 @@
 namespace OsmSharp.IO.API.Tests
 {
     [TestClass]
-    [Ignore("Should only be ran manually - comment-out for testing, do not check-in")]
-    public class BasicAuthClientTests
+    public class OAuth2ClientTests
     {
         private IAuthClient client;
 
@@ -26,7 +24,7 @@ public class BasicAuthClientTests
 
         private static readonly TagsCollection ChangeSetTags = new TagsCollection()
         {
-            new Tag("comment", "Running a functional test of an automated system."),
+            new Tag("comment", "Running a functional test of an automation tool."),
             new Tag("created_by", "https://github.com/OsmSharp/osm-api-client/"),
             new Tag("bot", "yes")
         };
@@ -37,13 +35,12 @@ public void TestInitialize()
             using var loggerFactory = LoggerFactory.Create(b => b.AddConsole());
             var logger = loggerFactory.CreateLogger("Tests");
             IClientsFactory clientFactory = new ClientsFactory(logger, new HttpClient(), ClientsFactory.DEVELOPMENT_URL);
-            // Enter your user name and password here or OAuth credential below - do not check-in!
-            client = clientFactory.CreateBasicAuthClient("user-email", "password");
-            //client = clientFactory.CreateOAuthClient("customerkey", "customerSecret", "token", "tokenSecret");
-            //client = clientFactory.CreateOAuth2Client("token");
+            // Enter your OAuth2 credential below - do not check-in!
+            client = clientFactory.CreateOAuth2Client("oAuth-token");
         }
 
         [TestMethod]
+        [Ignore("Should only be ran manually - comment-out for testing, do not check-in")]
         public async Task TestChangesetLifeCycle()
         {
             var user = await client.GetUserDetails();
@@ -101,6 +98,7 @@ public async Task TestChangesetLifeCycle()
         }
 
         [TestMethod]
+        [Ignore("Should only be ran manually - comment-out for testing, do not check-in")]
         public async Task TestPreferences()
         {
             var preferences = await client.GetUserPreferences();
@@ -122,6 +120,7 @@ public async Task TestPreferences()
         }
 
         [TestMethod]
+        [Ignore("Should only be ran manually - comment-out for testing, do not check-in")]
         public async Task TestNotes()
         {
             var permissions = await client.GetPermissions();
@@ -162,6 +161,7 @@ public async Task TestNotes()
         }
 
         [TestMethod]
+        [Ignore("Should only be ran manually - comment-out for testing, do not check-in")]
         public async Task TestTraces()
         {
             using var gpxStream = File.Open("test.gpx", FileMode.Open);
@@ -171,6 +171,7 @@ public async Task TestTraces()
             NewGpx.Description += updatedText;
             await client.UpdateTrace(NewGpx);
             var myTraces = await client.GetTraces();
+            var originalLength = myTraces.Length;
             Assert.IsTrue(myTraces?.Length > 0);
             var gpxDetails = await client.GetTraceDetails(NewGpx.Id);
             Assert.IsNotNull(gpxDetails);
@@ -179,12 +180,9 @@ public async Task TestTraces()
             Assert.IsNotNull(gpxStreamBack.Stream);
             Assert.IsNotNull(gpxStreamBack.FileName);
             Assert.IsNotNull(gpxStreamBack.ContentType);
-            foreach (var trace in myTraces)
-            {
-                await client.DeleteTrace(trace.Id);
-            }
+            await client.DeleteTrace(NewGpx.Id);
             myTraces = await client.GetTraces();
-            Assert.AreEqual(0 ,myTraces?.Length);
+            Assert.AreEqual(originalLength - 1, myTraces?.Length);
         }
     }
 }
diff --git a/OsmSharp.IO.API.Tests/OsmSharp.IO.API.Tests.csproj b/OsmSharp.IO.API.Tests/OsmSharp.IO.API.Tests.csproj
index a4b111a..132ecfb 100644
--- a/OsmSharp.IO.API.Tests/OsmSharp.IO.API.Tests.csproj
+++ b/OsmSharp.IO.API.Tests/OsmSharp.IO.API.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/OsmSharp.IO.API/AuthClient.cs b/OsmSharp.IO.API/AuthClient.cs
deleted file mode 100644
index 060a913..0000000
--- a/OsmSharp.IO.API/AuthClient.cs
+++ /dev/null
@@ -1,309 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Text;
-using System.Threading.Tasks;
-using OsmSharp.API;
-using OsmSharp.Changesets;
-using OsmSharp.Tags;
-using OsmSharp.Complete;
-using OsmSharp.IO.Xml;
-using System.Web;
-using Microsoft.Extensions.Logging;
-
-namespace OsmSharp.IO.API
-{
-    public abstract class AuthClient : NonAuthClient, IAuthClient
-    {
-        /// <summary>
-        /// Creates an instance of an AuthClient which can make
-        /// authenticated (read and write) calls to the OSM API.
-        /// </summary>
-        /// <param name="baseAddress">The base address for the OSM API (for example: 'https://www.openstreetmap.org/api/0.6/')</param>
-        /// <param name="httpClient">An HttpClient</param>
-        /// <param name="logger">For logging out details of requests. Optional.</param>
-        protected AuthClient(string baseAddress, HttpClient httpClient, ILogger logger = null)
-            : base(baseAddress, httpClient, logger)
-        { }
-
-        #region Users
-        /// <inheritdoc />
-        public async Task<Permissions> GetPermissions()
-        {
-            var address = BaseAddress + "0.6/permissions";
-            var osm = await Get<Osm>(address, c => AddAuthentication(c, address));
-            return osm.Permissions;
-        }
-
-        /// <inheritdoc />
-        public async Task<User> GetUserDetails()
-        {
-            var address = BaseAddress + "0.6/user/details";
-            var osm = await Get<Osm>(address, c => AddAuthentication(c, address));
-            return osm.User;
-        }
-
-        /// <inheritdoc />
-        public async Task<Preference[]> GetUserPreferences()
-        {
-            var address = BaseAddress + "0.6/user/preferences";
-            var osm = await Get<Osm>(address, c => AddAuthentication(c, address));
-            return osm.Preferences.UserPreferences;
-        }
-
-        /// <inheritdoc />
-        public async Task SetUserPreferences(Preferences preferences)
-        {
-            var address = BaseAddress + "0.6/user/preferences";
-            var osm = new Osm() { Preferences = preferences };
-            var content = new StringContent(osm.SerializeToXml());
-            await SendAuthRequest(HttpMethod.Put, address, content);
-        }
-
-        /// <inheritdoc />
-        public async Task<string> GetUserPreference(string key)
-        {
-            var address = BaseAddress + $"0.6/user/preferences/{Encode(key)}";
-            var content = await Get(address, c => AddAuthentication(c, address));
-            var value = await content.ReadAsStringAsync();
-            return value;
-        }
-
-        /// <inheritdoc />
-        public async Task SetUserPreference(string key, string value)
-        {
-            var address = BaseAddress + $"0.6/user/preferences/{Encode(key)}";
-            var content = new StringContent(value);
-            await SendAuthRequest(HttpMethod.Put, address, content);
-        }
-
-        /// <inheritdoc />
-        public async Task DeleteUserPreference(string key)
-        {
-            var address = BaseAddress + $"0.6/user/preferences/{Encode(key)}";
-            await SendAuthRequest(HttpMethod.Delete, address, null);
-        }
-        #endregion
-
-        #region Changesets and Element Changes
-        /// <inheritdoc />
-        public async Task<long> CreateChangeset(TagsCollectionBase tags)
-        {
-            Validate.ContainsTags(tags, "comment", "created_by");
-            var address = BaseAddress + "0.6/changeset/create";
-            var changeSet = new Osm { Changesets = new[] { new Changeset { Tags = tags } } };
-            var content = new StringContent(changeSet.SerializeToXml());
-            var resultContent = await SendAuthRequest(HttpMethod.Put, address, content);
-            var id = await resultContent.ReadAsStringAsync();
-            return long.Parse(id);
-        }
-
-        /// <inheritdoc />
-        public async Task<Changeset> UpdateChangeset(long changesetId, TagsCollectionBase tags)
-        {
-            Validate.ContainsTags(tags, "comment", "created_by");
-            // TODO: Validate change meets OsmSharp.API.Capabilities?
-            var address = BaseAddress + $"0.6/changeset/{changesetId}";
-            var changeSet = new Osm { Changesets = new[] { new Changeset { Tags = tags } } };
-            var content = new StringContent(changeSet.SerializeToXml());
-            var osm = await Put<Osm>(address, content);
-            return osm.Changesets[0];
-        }
-
-        /// <inheritdoc />
-        public async Task<DiffResult> UploadChangeset(long changesetId, OsmChange osmChange)
-        {
-            var elements = new OsmGeo[][] { osmChange.Create, osmChange.Modify, osmChange.Delete }
-                .Where(c => c != null).SelectMany(c => c);
-
-            foreach (var osmGeo in elements)
-            {
-                osmGeo.ChangeSetId = changesetId;
-            }
-
-            var address = BaseAddress + $"0.6/changeset/{changesetId}/upload";
-            var request = new StringContent(osmChange.SerializeToXml());
-
-            return await Post<DiffResult>(address, request);
-        }
-
-        /// <inheritdoc />
-        public async Task<long> CreateElement(long changesetId, OsmGeo osmGeo)
-        {
-            var address = BaseAddress + $"0.6/{osmGeo.Type.ToString().ToLower()}/create";
-            var osmRequest = GetOsmRequest(changesetId, osmGeo);
-            var content = new StringContent(osmRequest.SerializeToXml());
-            var response = await SendAuthRequest(HttpMethod.Put, address, content);
-            var id = await response.ReadAsStringAsync();
-            return long.Parse(id);
-        }
-
-        /// <inheritdoc />
-        public async Task<long> UpdateElement(long changesetId, ICompleteOsmGeo osmGeo)
-        {
-            switch (osmGeo.Type)
-            {
-                case OsmGeoType.Node:
-                    return await UpdateElement(changesetId, osmGeo as OsmGeo);
-                case OsmGeoType.Way:
-                    return await UpdateElement(changesetId, ((CompleteWay)osmGeo).ToSimple());
-                case OsmGeoType.Relation:
-                    return await UpdateElement(changesetId, ((CompleteRelation)osmGeo).ToSimple());
-                default:
-                    throw new Exception($"Invalid OSM geometry type: {osmGeo.Type}");
-            }
-        }
-
-        /// <inheritdoc />
-        public async Task<long> UpdateElement(long changesetId, OsmGeo osmGeo)
-        {
-            Validate.ElementHasAVersion(osmGeo);
-            var address = BaseAddress + $"0.6/{osmGeo.Type.ToString().ToLower()}/{osmGeo.Id}";
-            var osmRequest = GetOsmRequest(changesetId, osmGeo);
-            var content = new StringContent(osmRequest.SerializeToXml());
-            var responseContent = await SendAuthRequest(HttpMethod.Put, address, content);
-            var newVersionNumber = await responseContent.ReadAsStringAsync();
-            return long.Parse(newVersionNumber);
-        }
-
-        /// <inheritdoc />
-        public async Task<long> DeleteElement(long changesetId, OsmGeo osmGeo)
-        {
-            Validate.ElementHasAVersion(osmGeo);
-            var address = BaseAddress + $"0.6/{osmGeo.Type.ToString().ToLower()}/{osmGeo.Id}";
-            var osmRequest = GetOsmRequest(changesetId, osmGeo);
-            var content = new StringContent(osmRequest.SerializeToXml());
-            var responseContent = await SendAuthRequest(HttpMethod.Delete, address, content);
-            var newVersionNumber = await responseContent.ReadAsStringAsync();
-            return long.Parse(newVersionNumber);
-        }
-
-        /// <inheritdoc />
-        public async Task CloseChangeset(long changesetId)
-        {
-            var address = BaseAddress + $"0.6/changeset/{changesetId}/close";
-            await SendAuthRequest(HttpMethod.Put, address, new StringContent(""));
-        }
-
-        /// <inheritdoc />
-        public async Task<Changeset> AddChangesetComment(long changesetId, string text)
-        {
-            var address = BaseAddress + $"0.6/changeset/{changesetId}/comment";
-            var content = new MultipartFormDataContent() { { new StringContent(text), "text" } };
-            var osm = await Post<Osm>(address, content);
-            return osm.Changesets[0];
-        }
-
-        /// <inheritdoc />
-        public async Task ChangesetSubscribe(long changesetId)
-        {
-            var address = BaseAddress + $"0.6/changeset/{changesetId}/subscribe";
-            await SendAuthRequest(HttpMethod.Post, address, new StringContent(""));
-        }
-
-        /// <inheritdoc />
-        public async Task ChangesetUnsubscribe(long changesetId)
-        {
-            var address = BaseAddress + $"0.6/changeset/{changesetId}/unsubscribe";
-            await SendAuthRequest(HttpMethod.Post, address, new StringContent(""));
-        }
-        #endregion
-
-        #region Traces
-        /// <inheritdoc />
-        public async Task<GpxFile[]> GetTraces()
-        {
-            var address = BaseAddress + "0.6/user/gpx_files";
-            var osm = await Get<Osm>(address, c => AddAuthentication(c, address));
-            return osm.GpxFiles ?? new GpxFile[0];
-        }
-
-        /// <inheritdoc />
-        public async Task<long> CreateTrace(GpxFile gpx, Stream fileStream)
-        {
-            var address = BaseAddress + "0.6/gpx/create";
-            var form = new MultipartFormDataContent();
-            form.Add(new StringContent(gpx.Description), "\"description\"");
-            form.Add(new StringContent(gpx.Visibility.ToString().ToLower()), "\"visibility\"");
-            var tags = string.Join(",", gpx.Tags ?? new string[0]);
-            form.Add(new StringContent(tags), "\"tags\"");
-            var stream = new StreamContent(fileStream);
-            var cleanName = Encoding.ASCII.GetString(Encoding.ASCII.GetBytes(gpx.Name));
-            form.Add(stream, "file", cleanName);
-            var content = await SendAuthRequest(HttpMethod.Post, address, form);
-            var id = await content.ReadAsStringAsync();
-            return long.Parse(id);
-        }
-
-        /// <inheritdoc />
-        public async Task UpdateTrace(GpxFile trace)
-        {
-            var address = BaseAddress + $"0.6/gpx/{trace.Id}";
-            var osm = new Osm { GpxFiles = new[] { trace } };
-            var content = new StringContent(osm.SerializeToXml());
-            await SendAuthRequest(HttpMethod.Put, address, content);
-        }
-
-        /// <inheritdoc />
-        public async Task DeleteTrace(long traceId)
-        {
-            var address = BaseAddress + $"0.6/gpx/{traceId}";
-            await SendAuthRequest(HttpMethod.Delete, address, null);
-        }
-        #endregion
-
-        #region Notes
-        /// <inheritdoc />
-        public async Task<Note> CommentNote(long noteId, string text)
-        {
-            var query = HttpUtility.ParseQueryString(string.Empty);
-            query["text"] = text;
-            var address = BaseAddress + $"0.6/notes/{noteId}/comment?{query}";
-            // Can be with Auth or without.
-            var osm = await Post<Osm>(address);
-            return osm.Notes[0];
-        }
-
-        /// <inheritdoc />
-        public async Task<Note> CloseNote(long noteId, string text)
-        {
-            var query = HttpUtility.ParseQueryString(string.Empty);
-            query["text"] = text;
-            var address = BaseAddress + $"0.6/notes/{noteId}/close?{query}";
-            var osm = await Post<Osm>(address);
-            return osm.Notes[0];
-        }
-
-        /// <inheritdoc />
-        public async Task<Note> ReOpenNote(long noteId, string text)
-        {
-            var query = HttpUtility.ParseQueryString(string.Empty);
-            query["text"] = text;
-            var address = BaseAddress + $"0.6/notes/{noteId}/reopen?{query}";
-            var osm = await Post<Osm>(address);
-            return osm.Notes[0];
-        }
-        #endregion
-
-        private Osm GetOsmRequest(long changesetId, OsmGeo osmGeo)
-        {
-            osmGeo.ChangeSetId = changesetId;
-            var osm = new Osm();
-            switch (osmGeo.Type)
-            {
-                case OsmGeoType.Node:
-                    osm.Nodes = new[] { osmGeo as Node };
-                    break;
-                case OsmGeoType.Way:
-                    osm.Ways = new[] { osmGeo as Way };
-                    break;
-                case OsmGeoType.Relation:
-                    osm.Relations = new[] { osmGeo as Relation };
-                    break;
-            }
-            return osm;
-        }
-    }
-}
-
diff --git a/OsmSharp.IO.API/BasicAuthClient.cs b/OsmSharp.IO.API/BasicAuthClient.cs
deleted file mode 100644
index 066ef3e..0000000
--- a/OsmSharp.IO.API/BasicAuthClient.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Microsoft.Extensions.Logging;
-using System;
-using System.Net.Http;
-using System.Text;
-
-namespace OsmSharp.IO.API
-{
-    /// <summary>
-    /// Use of basic auth is discouraged. Use OAuth when practical.
-    /// </summary>
-    public class BasicAuthClient : AuthClient
-    {
-        private readonly string Username;
-        private readonly string Password;
-
-        public BasicAuthClient(HttpClient httpClient,
-            ILogger logger,
-            string baseAddress, 
-            string username, 
-            string password)
-            : base (baseAddress, httpClient, logger)
-        {
-            Username = username;
-            Password = password;
-        }
-
-        protected override void AddAuthentication(HttpRequestMessage request, string url, string method = "GET")
-        {
-            var auth = Convert.ToBase64String(Encoding.ASCII.GetBytes(Username + ":" + Password));
-            request.Headers.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Basic", auth);
-        }
-    }
-}
diff --git a/OsmSharp.IO.API/ClientsFactory.cs b/OsmSharp.IO.API/ClientsFactory.cs
index 4f36d12..ebdcdba 100644
--- a/OsmSharp.IO.API/ClientsFactory.cs
+++ b/OsmSharp.IO.API/ClientsFactory.cs
@@ -1,8 +1,5 @@
 using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
 using System.Net.Http;
-using System.Text;
 
 namespace OsmSharp.IO.API
 {
@@ -33,25 +30,13 @@ public ClientsFactory(ILogger logger, HttpClient httpClient, string baseAddress)
         /// <inheritdoc/>
         public INonAuthClient CreateNonAuthClient()
         {
-            return new NonAuthClient(_baseAddress, _httpClient, _logger);
+            return new OsmClient(_baseAddress, _httpClient, null, _logger);
         }
 
-        /// <inheritdoc/>
-        public IAuthClient CreateBasicAuthClient(string username, string password)
-        {
-            return new BasicAuthClient(_httpClient, _logger, _baseAddress, username, password);
-        }
-
-        /// <inheritdoc/>
-        public IAuthClient CreateOAuthClient(string consumerKey, string consumerSecret, string token, string tokenSecret)
-        {
-            return new OAuthClient(_httpClient, _logger, _baseAddress, consumerKey, consumerSecret, token, tokenSecret);
-        }
-        
         /// <inheritdoc/>
         public IAuthClient CreateOAuth2Client(string token)
         {
-            return new OAuth2Client(_httpClient, _logger, _baseAddress, token);
+            return new OsmClient(_baseAddress, _httpClient, token, _logger);
         }
     }
 }
diff --git a/OsmSharp.IO.API/IClientsFactory.cs b/OsmSharp.IO.API/IClientsFactory.cs
index bbcf96c..31965f3 100644
--- a/OsmSharp.IO.API/IClientsFactory.cs
+++ b/OsmSharp.IO.API/IClientsFactory.cs
@@ -11,22 +11,6 @@ public interface IClientsFactory
         /// </summary>
         /// <returns></returns>
         INonAuthClient CreateNonAuthClient();
-        /// <summary>
-        /// Creates a client that needs user name and password credentials
-        /// </summary>
-        /// <param name="username"></param>
-        /// <param name="password"></param>
-        /// <returns></returns>
-        IAuthClient CreateBasicAuthClient(string username, string password);
-        /// <summary>
-        /// Creates a client that will use OAuth 1.0 credentials provided from the OAuth OSM page
-        /// </summary>
-        /// <param name="consumerKey"></param>
-        /// <param name="consumerSecret"></param>
-        /// <param name="token"></param>
-        /// <param name="tokenSecret"></param>
-        /// <returns></returns>
-        IAuthClient CreateOAuthClient(string consumerKey, string consumerSecret, string token, string tokenSecret);
 
         /// <summary>
         /// Creates a client that will use OAuth 2.0 credentials provided from the OAuth OSM page
diff --git a/OsmSharp.IO.API/INonAuthClient.cs b/OsmSharp.IO.API/INonAuthClient.cs
index 6a754d2..ef6246e 100644
--- a/OsmSharp.IO.API/INonAuthClient.cs
+++ b/OsmSharp.IO.API/INonAuthClient.cs
@@ -5,50 +5,243 @@
 using OsmSharp.API;
 using OsmSharp.Changesets;
 using OsmSharp.Complete;
-using OsmSharp.Db;
 
 namespace OsmSharp.IO.API
 {
     public interface INonAuthClient
     {
+        /// <summary>
+        /// Available API versions
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Available_API_versions:_GET_.2Fapi.2Fversions">
+        /// GET /api/versions</see>.
+        /// </summary>
         Task<double?> GetVersions();
+        /// <summary>
+        /// API Capabilities
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Capabilities:_GET_.2Fapi.2Fcapabilities">
+        /// GET /api/capabilities</see>.
+        /// </summary>
         Task<Osm> GetCapabilities();
+        /// <summary>
+        /// Retrieving map data by bounding box
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Retrieving_map_data_by_bounding_box:_GET_.2Fapi.2F0.6.2Fmap">
+        /// GET /api/0.6/map</see>.
+        /// </summary>
         Task<Osm> GetMap(Bounds bounds);
         Task<User> GetUser(long id);
         Task<User[]> GetUsers(params long[] ids);
+        /// <summary>
+        /// Gets a Way, including the details of each Node in it
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Full:_GET_.2Fapi.2F0.6.2F.5Bway.7Crelation.5D.2F.23id.2Ffull">
+        /// GET /api/0.6/way/#id/full</see>.
+        /// </summary>
         Task<CompleteWay> GetCompleteWay(long id);
+        /// <summary>
+        /// Gats a Relation, including the details of each Element in it
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Full:_GET_.2Fapi.2F0.6.2F.5Bway.7Crelation.5D.2F.23id.2Ffull">
+        /// GET /api/0.6/relation/#id/full</see>.
+        /// </summary>
         Task<CompleteRelation> GetCompleteRelation(long id);
+        /// <summary>
+        /// Gets a Node and its details
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Read:_GET_.2Fapi.2F0.6.2F.5Bnode.7Cway.7Crelation.5D.2F.23id">
+        /// GET /api/0.6/node/#id</see>.
+        /// </summary>
         Task<Node> GetNode(long id);
+        /// <summary>
+        /// Gets a Way and its details (but not the details of its Nodes)
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Read:_GET_.2Fapi.2F0.6.2F.5Bnode.7Cway.7Crelation.5D.2F.23id">
+        /// GET /api/0.6/way/#id</see>.
+        /// </summary>
         Task<Way> GetWay(long id);
+        /// <summary>
+        /// Gets a Relation and its details (but not the details of its elements)
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Read:_GET_.2Fapi.2F0.6.2F.5Bnode.7Cway.7Crelation.5D.2F.23id">
+        /// GET /api/0.6/relation/#id</see>.
+        /// </summary>
         Task<Relation> GetRelation(long id);
+        /// <summary>
+        /// Gets a Node's history
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#History:_GET_.2Fapi.2F0.6.2F.5Bnode.7Cway.7Crelation.5D.2F.23id.2Fhistory">
+        /// GET /api/0.6/node/#id/history</see>.
+        /// </summary>
         Task<Node[]> GetNodeHistory(long id);
+        /// <summary>
+        /// Gets a Way's history
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#History:_GET_.2Fapi.2F0.6.2F.5Bnode.7Cway.7Crelation.5D.2F.23id.2Fhistory">
+        /// GET /api/0.6/way/#id/history</see>.
+        /// </summary>
         Task<Way[]> GetWayHistory(long id);
+        /// <summary>
+        /// Gets a Relation's history
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#History:_GET_.2Fapi.2F0.6.2F.5Bnode.7Cway.7Crelation.5D.2F.23id.2Fhistory">
+        /// GET /api/0.6/relation/#id/history</see>.
+        /// </summary>
         Task<Relation[]> GetRelationHistory(long id);
+        /// <summary>
+        /// Gets a Node's version
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Version:_GET_.2Fapi.2F0.6.2F.5Bnode.7Cway.7Crelation.5D.2F.23id.2F.23version">
+        /// GET /api/0.6/node/#id/#version</see>.
+        /// </summary>
         Task<Node> GetNodeVersion(long id, long version);
+        /// <summary>
+        /// Gets a Way's version
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Version:_GET_.2Fapi.2F0.6.2F.5Bnode.7Cway.7Crelation.5D.2F.23id.2F.23version">
+        /// GET /api/0.6/way/#id/#version</see>.
+        /// </summary>
         Task<Way> GetWayVersion(long id, long version);
+        /// <summary>
+        /// Gets a Relation's version
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Version:_GET_.2Fapi.2F0.6.2F.5Bnode.7Cway.7Crelation.5D.2F.23id.2F.23version">
+        /// GET /api/0.6/relation/#id/#version</see>.
+        /// </summary>
         Task<Relation> GetRelationVersion(long id, long version);
+        /// <summary>
+        /// Gets many Nodes
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Multi_fetch:_GET_.2Fapi.2F0.6.2F.5Bnodes.7Cways.7Crelations.5D.3F.23parameters">
+        /// GET /api/0.6/nodes?#parameters</see>.
+        /// </summary>
         Task<Node[]> GetNodes(params long[] ids);
+        /// <summary>
+        /// Gets many Ways
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Multi_fetch:_GET_.2Fapi.2F0.6.2F.5Bnodes.7Cways.7Crelations.5D.3F.23parameters">
+        /// GET /api/0.6/ways?#parameters</see>.
+        /// </summary>
         Task<Way[]> GetWays(params long[] ids);
+        /// <summary>
+        /// Gets many Relations
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Multi_fetch:_GET_.2Fapi.2F0.6.2F.5Bnodes.7Cways.7Crelations.5D.3F.23parameters">
+        /// GET /api/0.6/relations?#parameters</see>.
+        /// </summary>
         Task<Relation[]> GetRelations(params long[] ids);
         Task<OsmGeo[]> GetElements(params OsmGeoKey[] elementKeys);
+        /// <summary>
+        /// Elements Multifetch
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Multi_fetch:_GET_.2Fapi.2F0.6.2F.5Bnodes.7Cways.7Crelations.5D.3F.23parameters">
+        /// GET /api/0.6/[nodes|ways|relations]?#parameters</see>.
+        /// </summary>
         Task<OsmGeo[]> GetElements(Dictionary<OsmGeoKey, long?> elementKeyVersions);
+        /// <summary>
+        /// Gets many Nodes at specific versions
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Multi_fetch:_GET_.2Fapi.2F0.6.2F.5Bnodes.7Cways.7Crelations.5D.3F.23parameters">
+        /// GET /api/0.6/nodes?#parameters</see>.
+        /// </summary>
         Task<Node[]> GetNodes(IEnumerable<KeyValuePair<long, long?>> idVersions);
+        /// <summary>
+        /// Gets many Ways at specific versions
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Multi_fetch:_GET_.2Fapi.2F0.6.2F.5Bnodes.7Cways.7Crelations.5D.3F.23parameters">
+        /// GET /api/0.6/ways?#parameters</see>.
+        /// </summary>
         Task<Way[]> GetWays(IEnumerable<KeyValuePair<long, long?>> idVersions);
+        /// <summary>
+        /// Gets many Relations at specific versions
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Multi_fetch:_GET_.2Fapi.2F0.6.2F.5Bnodes.7Cways.7Crelations.5D.3F.23parameters">
+        /// GET /api/0.6/relations?#parameters</see>.
+        /// </summary>
         Task<Relation[]> GetRelations(IEnumerable<KeyValuePair<long, long?>> idVersions);
+        /// <summary>
+        /// Gets the Relations containing a specific Node
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Relations_for_element:_GET_.2Fapi.2F0.6.2F.5Bnode.7Cway.7Crelation.5D.2F.23id.2Frelations">
+        /// GET /api/0.6/node/#id/relations</see>.
+        /// </summary>
         Task<Relation[]> GetNodeRelations(long id);
+        /// <summary>
+        /// Gets the Relations containing a specific Way
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Relations_for_element:_GET_.2Fapi.2F0.6.2F.5Bnode.7Cway.7Crelation.5D.2F.23id.2Frelations">
+        /// GET /api/0.6/way/#id/relations</see>.
+        /// </summary>
         Task<Relation[]> GetWayRelations(long id);
+        /// <summary>
+        /// Gets the Relations containing a specific Relation
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Relations_for_element:_GET_.2Fapi.2F0.6.2F.5Bnode.7Cway.7Crelation.5D.2F.23id.2Frelations">
+        /// GET /api/0.6/relation/#id/relations</see>.
+        /// </summary>
         Task<Relation[]> GetRelationRelations(long id);
+        /// <summary>
+        /// Node Ways
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Ways_for_node:_GET_.2Fapi.2F0.6.2Fnode.2F.23id.2Fways">
+        /// GET /api/0.6/node/#id/ways</see>.
+        /// </summary>
         Task<Way[]> GetNodeWays(long id);
+        /// <summary>
+        /// Changeset Read
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Read:_GET_.2Fapi.2F0.6.2Fchangeset.2F.23id.3Finclude_discussion.3Dtrue">
+        /// GET /api/0.6/changeset/#id?include_discussion=true</see>.
+        /// </summary>
         Task<Changeset> GetChangeset(long changesetId, bool includeDiscussion = false);
+        /// <summary>
+        /// Changeset Query
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Query:_GET_.2Fapi.2F0.6.2Fchangesets">
+        /// GET /api/0.6/changesets</see>
+        /// </summary>
         Task<Changeset[]> QueryChangesets(Bounds bounds, long? userId, string userName, DateTime? minClosedDate, DateTime? maxOpenedDate, bool openOnly, bool closedOnly, long[] ids);
+        /// <summary>
+        /// Changeset Download
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Read:_GET_.2Fapi.2F0.6.2Fchangeset.2F.23id.3Finclude_discussion.3Dtrue">
+        /// GET /api/0.6/changeset/#id/download</see>
+        /// </summary>
         Task<OsmChange> GetChangesetDownload(long changesetId);
+        /// <summary>
+        /// Get GPS Points
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Get_GPS_Points:_Get_.2Fapi.2F0.6.2Ftrackpoints.3Fbbox.3Dleft.2Cbottom.2Cright.2Ctop.26page.3DpageNumber">
+        /// Get /api/0.6/trackpoints?bbox=left,bottom,right,top&page=pageNumber</see>.
+        /// Retrieve the GPS track points that are inside a given bounding box (formatted in a GPX format).
+        /// Warning: GPX version 1.0 is not the current version. Your tools might not support it.
+        /// </summary>
+        /// <returns>A stream of a GPX (version 1.0) file.</returns>
         Task<Stream> GetTrackPoints(Bounds bounds, int pageNumber = 0);
+        /// <summary>
+        /// Download Metadata
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Download_Metadata:_GET_.2Fapi.2F0.6.2Fgpx.2F.23id.2Fdetails">
+        /// GET /api/0.6/gpx/#id/details</see>.
+        /// </summary>
         Task<GpxFile> GetTraceDetails(long id);
+        /// <summary>
+        /// Download Data
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Download_Data:_GET_.2Fapi.2F0.6.2Fgpx.2F.23id.2Fdata">
+        /// GET /api/0.6/gpx/#id/data</see>.
+        /// This will return exactly what was uploaded, which might not be a gpx file (it could be a zip etc.)
+        /// </summary>
+        /// <returns>A stream of a GPX (version 1.0) file.</returns>
         Task<TypedStream> GetTraceData(long id);
+        /// <summary>
+        /// Gets a Note
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Read:_GET_.2Fapi.2F0.6.2Fnotes.2F.23id">
+        /// GET /api/0.6/notes/#id</see>.
+        /// </summary>
         Task<Note> GetNote(long id);
+        /// <summary>
+        /// Gets many a Notes in a box and with the spcified time since closed
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Retrieving_notes_data_by_bounding_box:_GET_.2Fapi.2F0.6.2Fnotes">
+        /// GET /api/0.6/notes?[parameters]</see>.
+        /// </summary>
+        /// <param name="limit">Must be between 1 and 10,000.</param>
+        /// <param name="maxClosedDays">0 means only open notes. -1 mean all (open and closed) notes.</param>
         Task<Note[]> GetNotes(Bounds bounds, int limit = 100, int maxClosedDays = 7);
+        /// <summary>
+        /// Gets an RSS feed of Notes in an area
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#RSS_Feed:_GET_.2Fapi.2F0.6.2Fnotes.2Ffeed">
+        /// GET /api/0.6/notes/feed</see>.
+        /// </summary>
         Task<Stream> GetNotesRssFeed(Bounds bounds);
+        /// <summary>
+        /// Search for Notes
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Search_for_notes:_GET_.2Fapi.2F0.6.2Fnotes.2Fsearch">
+        /// GET /api/0.6/notes/search</see>.
+        /// </summary>
+        /// <param name="searchText">Specifies the search query. This is the only required field.</param>
+        /// <param name="userId">Specifies the creator of the returned notes by the id of the user. Does not work together with the display_name parameter</param>
+        /// <param name="userName">Specifies the creator of the returned notes by the display name. Does not work together with the user parameter</param>
+        /// <param name="limit">Must be between 1 and 10,000. 100 is default if null.</param>
+        /// <param name="maxClosedDays">0 means only open notes. -1 mean all (open and closed) notes. 7 is default if null.</param>
+        /// <param name="fromDate">Specifies the beginning of a date range to search in for a note</param>
+        /// <param name="toDate">Specifies the end of a date range to search in for a note</param>
         Task<Note[]> QueryNotes(string searchText, long? userId, string userName, int? limit, int? maxClosedDays, DateTime? fromDate, DateTime? toDate);
+        /// <summary>
+        /// Creates a new Note
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Create_a_new_note:_Create:_POST_.2Fapi.2F0.6.2Fnotes">
+        /// POST /api/0.6/notes</see>.
+        /// </summary>
         Task<Note> CreateNote(double latitude, double longitude, string text);
     }
 }
\ No newline at end of file
diff --git a/OsmSharp.IO.API/OAuth2Client.cs b/OsmSharp.IO.API/OAuth2Client.cs
deleted file mode 100644
index d13387f..0000000
--- a/OsmSharp.IO.API/OAuth2Client.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System.Net.Http;
-using Microsoft.Extensions.Logging;
-
-namespace OsmSharp.IO.API
-{
-    public class OAuth2Client : AuthClient
-    {
-        private readonly string Token;
-        public OAuth2Client(HttpClient httpClient, ILogger logger, string baseAddress, string token) : base(baseAddress, httpClient, logger)
-        {
-            Token = token;
-        }
-        
-        protected override void AddAuthentication(HttpRequestMessage message, string url, string method = "GET")
-        {
-            message.Headers.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", this.Token);
-        }
-    }
-}
\ No newline at end of file
diff --git a/OsmSharp.IO.API/OAuthClient.cs b/OsmSharp.IO.API/OAuthClient.cs
deleted file mode 100644
index 8e8a887..0000000
--- a/OsmSharp.IO.API/OAuthClient.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using Microsoft.Extensions.Logging;
-using System;
-using System.Net.Http;
-
-namespace OsmSharp.IO.API
-{
-    public class OAuthClient : AuthClient
-    {
-        /// <summary>
-        /// The OSM consumer key that was generated from OSM site
-        /// </summary>
-        private readonly string ConsumerKey;
-        /// <summary>
-        /// The OSM consumer secret that was generated from OSM site
-        /// </summary>
-        private readonly string ConsumerSecret;
-        private readonly string Token;
-        private readonly string TokenSecret;
-
-        public OAuthClient(HttpClient httpClient,
-            ILogger logger,
-            string baseAddress,
-            string consumerKey, 
-            string consumerSecret, 
-            string token, 
-            string tokenSecret)
-            : base (baseAddress, httpClient, logger)
-        {
-            ConsumerKey = consumerKey;
-            ConsumerSecret = consumerSecret;
-            Token = token;
-            TokenSecret = tokenSecret;
-        }
-
-        protected override void AddAuthentication(HttpRequestMessage message, string url, string method = "GET")
-        {
-            var request = new OAuth.OAuthRequest
-            {
-                ConsumerKey = ConsumerKey,
-                ConsumerSecret = ConsumerSecret,
-                Token = Token,
-                TokenSecret = TokenSecret,
-                Type = OAuth.OAuthRequestType.ProtectedResource,
-                SignatureMethod = OAuth.OAuthSignatureMethod.HmacSha1,
-                RequestUrl = url,
-                Version = "1.0",
-                Method = method
-            };
-            var auth = request.GetAuthorizationHeader().Replace("OAuth ", "");
-            message.Headers.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("OAuth", auth);
-        }
-    }
-}
\ No newline at end of file
diff --git a/OsmSharp.IO.API/NonAuthClient.cs b/OsmSharp.IO.API/OsmClient.cs
similarity index 55%
rename from OsmSharp.IO.API/NonAuthClient.cs
rename to OsmSharp.IO.API/OsmClient.cs
index 5b1eeae..e2d435e 100644
--- a/OsmSharp.IO.API/NonAuthClient.cs
+++ b/OsmSharp.IO.API/OsmClient.cs
@@ -14,12 +14,13 @@
 using System.IO;
 using System.Web;
 using Microsoft.Extensions.Logging;
-using OsmSharp.Db;
 using System.Globalization;
+using OsmSharp.IO.Xml;
+using OsmSharp.Tags;
 
 namespace OsmSharp.IO.API
 {
-    public class NonAuthClient : INonAuthClient
+    public class OsmClient : IAuthClient
     {
         /// <summary>
         /// The OSM base address
@@ -28,13 +29,18 @@ public class NonAuthClient : INonAuthClient
         /// "https://master.apis.dev.openstreetmap.org/api/"
         /// "https://www.openstreetmap.org/api/"
         /// </example>
-        protected readonly string BaseAddress;
+        private readonly string _baseAddress;
 
+        /// <summary>
+        /// The OSM OAuth2 bearer token used for authentication
+        /// </summary>
+        private readonly string _token;
+        
         // Prevent scientific notation in a url.
-        protected string OsmMaxPrecision = "0.########";
+        private const string OsmMaxPrecision = "0.########";
 
         private readonly HttpClient _httpClient;
-        protected readonly ILogger _logger;
+        private readonly ILogger _logger;
 
         /// <summary>
         /// Creates an instance of a NonAuthClient which can make
@@ -42,92 +48,52 @@ public class NonAuthClient : INonAuthClient
         /// </summary>
         /// <param name="baseAddress">The base address for the OSM API (for example: 'https://www.openstreetmap.org/api/0.6/')</param>
         /// <param name="httpClient">An HttpClient</param>
+        /// <param name="token">OAuth2 bearer token</param>
         /// <param name="logger">For logging out details of requests. Optional.</param>
-        public NonAuthClient(string baseAddress,
+        public OsmClient(string baseAddress,
             HttpClient httpClient,
+            string token = null,
             ILogger logger = null)
         {
-            BaseAddress = baseAddress;
+            _baseAddress = baseAddress;
             _httpClient = httpClient;
             _logger = logger;
+            _token = token;
         }
 
         #region Miscellaneous
-        /// <summary>
-        /// Available API versions
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Available_API_versions:_GET_.2Fapi.2Fversions">
-        /// GET /api/versions</see>.
-        /// </summary>
+        /// <inheritdoc />
         public async Task<double?> GetVersions()
         {
-            var osm = await Get<Osm>(BaseAddress + "versions");
+            var osm = await Get<Osm>(_baseAddress + "versions");
             return osm.Api.Version.Maximum;
         }
 
-        /// <summary>
-        /// API Capabilities
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Capabilities:_GET_.2Fapi.2Fcapabilities">
-        /// GET /api/capabilities</see>.
-        /// </summary>
+        /// <inheritdoc />
         public async Task<Osm> GetCapabilities()
         {
-            return await Get<Osm>(BaseAddress + "0.6/capabilities");
+            return await Get<Osm>(_baseAddress + "0.6/capabilities");
         }
 
-        /// <summary>
-        /// Retrieving map data by bounding box
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Retrieving_map_data_by_bounding_box:_GET_.2Fapi.2F0.6.2Fmap">
-        /// GET /api/0.6/map</see>.
-        /// </summary>
+        /// <inheritdoc />
         public async Task<Osm> GetMap(Bounds bounds)
         {
             Validate.BoundLimits(bounds);
-            var address = BaseAddress + $"0.6/map?bbox={ToString(bounds)}";
+            var address = _baseAddress + $"0.6/map?bbox={ToString(bounds)}";
 
             return await Get<Osm>(address);
         }
-
-        /// <summary>
-        /// Details of a User
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Details_of_a_user">
-        /// GET /api/0.6/user/#id</see>.
-        /// </summary>
-        public async Task<User> GetUser(long id)
-        {
-            var address = BaseAddress + $"0.6/user/{id}";
-            var osm = await Get<Osm>(address);
-            return osm.User;
-        }
-
-        /// <summary>
-        /// Details of multiple Users
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Details_of_multiple_users">
-        /// GET /api/0.6/users?users=#id1,#id2,...,#idn</see>.
-        /// </summary>
-        public async Task<User[]> GetUsers(params long[] ids)
-        {
-            var address = BaseAddress + $"0.6/users?users={string.Join(",", ids)}";
-            var osm = await Get<Osm>(address);
-            return osm.Users;
-        }
+        
         #endregion
 
         #region Elements
-        /// <summary>
-        /// Gets a Way, including the details of each Node in it
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Full:_GET_.2Fapi.2F0.6.2F.5Bway.7Crelation.5D.2F.23id.2Ffull">
-        /// GET /api/0.6/way/#id/full</see>.
-        /// </summary>
+        /// <inheritdoc />
         public Task<CompleteWay> GetCompleteWay(long id)
         {
             return GetCompleteElement<CompleteWay>(id);
         }
 
-        /// <summary>
-        /// Gats a Relation, including the details of each Element in it
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Full:_GET_.2Fapi.2F0.6.2F.5Bway.7Crelation.5D.2F.23id.2Ffull">
-        /// GET /api/0.6/relation/#id/full</see>.
-        /// </summary>
+        /// <inheritdoc />
         public Task<CompleteRelation> GetCompleteRelation(long id)
         {
             return GetCompleteElement<CompleteRelation>(id);
@@ -141,7 +107,7 @@ public Task<CompleteRelation> GetCompleteRelation(long id)
         private async Task<TCompleteOsmGeo> GetCompleteElement<TCompleteOsmGeo>(long id) where TCompleteOsmGeo : ICompleteOsmGeo, new()
         {
             var type = new TCompleteOsmGeo().Type.ToString().ToLower();
-            var address = BaseAddress + $"0.6/{type}/{id}/full";
+            var address = _baseAddress + $"0.6/{type}/{id}/full";
             var content = await Get(address);
             var stream = await content.ReadAsStreamAsync();
             var streamSource = new XmlOsmStreamSource(stream);
@@ -150,31 +116,19 @@ public Task<CompleteRelation> GetCompleteRelation(long id)
             return element;
         }
 
-        /// <summary>
-        /// Gets a Node and its details
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Read:_GET_.2Fapi.2F0.6.2F.5Bnode.7Cway.7Crelation.5D.2F.23id">
-        /// GET /api/0.6/node/#id</see>.
-        /// </summary>
+        /// <inheritdoc />
         public async Task<Node> GetNode(long id)
         {
             return await GetElement<Node>(id);
         }
 
-        /// <summary>
-        /// Gets a Way and its details (but not the details of its Nodes)
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Read:_GET_.2Fapi.2F0.6.2F.5Bnode.7Cway.7Crelation.5D.2F.23id">
-        /// GET /api/0.6/way/#id</see>.
-        /// </summary>
+        /// <inheritdoc />
         public async Task<Way> GetWay(long id)
         {
             return await GetElement<Way>(id);
         }
 
-        /// <summary>
-        /// Gets a Relation and its details (but not the details of its elements)
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Read:_GET_.2Fapi.2F0.6.2F.5Bnode.7Cway.7Crelation.5D.2F.23id">
-        /// GET /api/0.6/relation/#id</see>.
-        /// </summary>
+        /// <inheritdoc />
         public async Task<Relation> GetRelation(long id)
         {
             return await GetElement<Relation>(id);
@@ -188,36 +142,24 @@ public async Task<Relation> GetRelation(long id)
         private async Task<TOsmGeo> GetElement<TOsmGeo>(long id) where TOsmGeo : OsmGeo, new()
         {
             var type = new TOsmGeo().Type.ToString().ToLower();
-            var address = BaseAddress + $"0.6/{type}/{id}";
+            var address = _baseAddress + $"0.6/{type}/{id}";
             var elements = await GetOfType<TOsmGeo>(address);
             return elements.FirstOrDefault();
         }
 
-        /// <summary>
-        /// Gets a Node's history
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#History:_GET_.2Fapi.2F0.6.2F.5Bnode.7Cway.7Crelation.5D.2F.23id.2Fhistory">
-        /// GET /api/0.6/node/#id/history</see>.
-        /// </summary>
+        /// <inheritdoc />
         public async Task<Node[]> GetNodeHistory(long id)
         {
             return await GetElementHistory<Node>(id);
         }
 
-        /// <summary>
-        /// Gets a Way's history
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#History:_GET_.2Fapi.2F0.6.2F.5Bnode.7Cway.7Crelation.5D.2F.23id.2Fhistory">
-        /// GET /api/0.6/way/#id/history</see>.
-        /// </summary>
+        /// <inheritdoc />
         public async Task<Way[]> GetWayHistory(long id)
         {
             return await GetElementHistory<Way>(id);
         }
 
-        /// <summary>
-        /// Gets a Relation's history
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#History:_GET_.2Fapi.2F0.6.2F.5Bnode.7Cway.7Crelation.5D.2F.23id.2Fhistory">
-        /// GET /api/0.6/relation/#id/history</see>.
-        /// </summary>
+        /// <inheritdoc />
         public async Task<Relation[]> GetRelationHistory(long id)
         {
             return await GetElementHistory<Relation>(id);
@@ -231,36 +173,24 @@ public async Task<Relation[]> GetRelationHistory(long id)
         private async Task<TOsmGeo[]> GetElementHistory<TOsmGeo>(long id) where TOsmGeo : OsmGeo, new()
         {
             var type = new TOsmGeo().Type.ToString().ToLower();
-            var address = BaseAddress + $"0.6/{type}/{id}/history";
+            var address = _baseAddress + $"0.6/{type}/{id}/history";
             var elements = await GetOfType<TOsmGeo>(address);
             return elements.ToArray();
         }
 
-        /// <summary>
-        /// Gets a Node's version
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Version:_GET_.2Fapi.2F0.6.2F.5Bnode.7Cway.7Crelation.5D.2F.23id.2F.23version">
-        /// GET /api/0.6/node/#id/#version</see>.
-        /// </summary>
+        /// <inheritdoc />
         public async Task<Node> GetNodeVersion(long id, long version)
         {
             return await GetElementVersion<Node>(id, version);
         }
 
-        /// <summary>
-        /// Gets a Way's version
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Version:_GET_.2Fapi.2F0.6.2F.5Bnode.7Cway.7Crelation.5D.2F.23id.2F.23version">
-        /// GET /api/0.6/way/#id/#version</see>.
-        /// </summary>
+        /// <inheritdoc />
         public async Task<Way> GetWayVersion(long id, long version)
         {
             return await GetElementVersion<Way>(id, version);
         }
 
-        /// <summary>
-        /// Gets a Relation's version
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Version:_GET_.2Fapi.2F0.6.2F.5Bnode.7Cway.7Crelation.5D.2F.23id.2F.23version">
-        /// GET /api/0.6/relation/#id/#version</see>.
-        /// </summary>
+        /// <inheritdoc />
         public async Task<Relation> GetRelationVersion(long id, long version)
         {
             return await GetElementVersion<Relation>(id, version);
@@ -274,36 +204,24 @@ public async Task<Relation> GetRelationVersion(long id, long version)
         private async Task<TOsmGeo> GetElementVersion<TOsmGeo>(long id, long version) where TOsmGeo : OsmGeo, new()
         {
             var type = new TOsmGeo().Type.ToString().ToLower();
-            var address = BaseAddress + $"0.6/{type}/{id}/{version}";
+            var address = _baseAddress + $"0.6/{type}/{id}/{version}";
             var elements = await GetOfType<TOsmGeo>(address);
             return elements.FirstOrDefault();
         }
 
-        /// <summary>
-        /// Gets many Nodes
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Multi_fetch:_GET_.2Fapi.2F0.6.2F.5Bnodes.7Cways.7Crelations.5D.3F.23parameters">
-        /// GET /api/0.6/nodes?#parameters</see>.
-        /// </summary>
+        /// <inheritdoc />
         public async Task<Node[]> GetNodes(params long[] ids)
         {
             return await GetElements<Node>(ids);
         }
 
-        /// <summary>
-        /// Gets many Ways
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Multi_fetch:_GET_.2Fapi.2F0.6.2F.5Bnodes.7Cways.7Crelations.5D.3F.23parameters">
-        /// GET /api/0.6/ways?#parameters</see>.
-        /// </summary>
+        /// <inheritdoc />
         public async Task<Way[]> GetWays(params long[] ids)
         {
             return await GetElements<Way>(ids);
         }
 
-        /// <summary>
-        /// Gets many Relations
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Multi_fetch:_GET_.2Fapi.2F0.6.2F.5Bnodes.7Cways.7Crelations.5D.3F.23parameters">
-        /// GET /api/0.6/relations?#parameters</see>.
-        /// </summary>
+        /// <inheritdoc />
         public async Task<Relation[]> GetRelations(params long[] ids)
         {
             return await GetElements<Relation>(ids);
@@ -315,31 +233,19 @@ public async Task<Relation[]> GetRelations(params long[] ids)
             return await GetElements<TOsmGeo>(idVersions);
         }
 
-        /// <summary>
-        /// Gets many Nodes at specific versions
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Multi_fetch:_GET_.2Fapi.2F0.6.2F.5Bnodes.7Cways.7Crelations.5D.3F.23parameters">
-        /// GET /api/0.6/nodes?#parameters</see>.
-        /// </summary>
+        /// <inheritdoc />
         public async Task<Node[]> GetNodes(IEnumerable<KeyValuePair<long, long?>> idVersions)
         {
             return await GetElements<Node>(idVersions);
         }
 
-        /// <summary>
-        /// Gets many Ways at specific versions
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Multi_fetch:_GET_.2Fapi.2F0.6.2F.5Bnodes.7Cways.7Crelations.5D.3F.23parameters">
-        /// GET /api/0.6/ways?#parameters</see>.
-        /// </summary>
+        /// <inheritdoc />
         public async Task<Way[]> GetWays(IEnumerable<KeyValuePair<long, long?>> idVersions)
         {
             return await GetElements<Way>(idVersions);
         }
 
-        /// <summary>
-        /// Gets many Relations at specific versions
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Multi_fetch:_GET_.2Fapi.2F0.6.2F.5Bnodes.7Cways.7Crelations.5D.3F.23parameters">
-        /// GET /api/0.6/relations?#parameters</see>.
-        /// </summary>
+        /// <inheritdoc />
         public async Task<Relation[]> GetRelations(IEnumerable<KeyValuePair<long, long?>> idVersions)
         {
             return await GetElements<Relation>(idVersions);
@@ -349,7 +255,8 @@ public async Task<OsmGeo[]> GetElements(params OsmGeoKey[] elementKeys)
         {
             return await GetElements(elementKeys.ToDictionary(ek => ek, ek => (long?)null));
         }
-
+        
+        /// <inheritdoc />
         public async Task<OsmGeo[]> GetElements(Dictionary<OsmGeoKey, long?> elementKeyVersions)
         {
             var elements = new List<OsmGeo>();
@@ -368,11 +275,7 @@ public async Task<OsmGeo[]> GetElements(Dictionary<OsmGeoKey, long?> elementKeyV
             return elements.ToArray();
         }
 
-        /// <summary>
-        /// Elements Multifetch
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Multi_fetch:_GET_.2Fapi.2F0.6.2F.5Bnodes.7Cways.7Crelations.5D.3F.23parameters">
-        /// GET /api/0.6/[nodes|ways|relations]?#parameters</see>.
-        /// </summary>
+        
         private async Task<TOsmGeo[]> GetElements<TOsmGeo>(IEnumerable<KeyValuePair<long, long?>> idVersions) where TOsmGeo : OsmGeo, new()
         {
             var tasks = new List<Task<IEnumerable<TOsmGeo>>>();
@@ -382,7 +285,7 @@ public async Task<OsmGeo[]> GetElements(Dictionary<OsmGeoKey, long?> elementKeyV
                 var type = new TOsmGeo().Type.ToString().ToLower();
                 // For exmple: "12,13,14v1,15v1"
                 var parameters = string.Join(",", chunk.Select(e => e.Value.HasValue ? $"{e.Key}v{e.Value}" : e.Key.ToString()));
-                var address = BaseAddress + $"0.6/{type}s?{type}s={parameters}";
+                var address = _baseAddress + $"0.6/{type}s?{type}s={parameters}";
                 tasks.Add(GetOfType<TOsmGeo>(address));
             }
 
@@ -398,31 +301,19 @@ private IEnumerable<T[]> Chunks<T>(IEnumerable<T> elements, int chunkSize)
                 .Select(g => g.Select(ei => ei.e).ToArray());
         }
 
-        /// <summary>
-        /// Gets the Relations containing a specific Node
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Relations_for_element:_GET_.2Fapi.2F0.6.2F.5Bnode.7Cway.7Crelation.5D.2F.23id.2Frelations">
-        /// GET /api/0.6/node/#id/relations</see>.
-        /// </summary>
+        /// <inheritdoc />
         public async Task<Relation[]> GetNodeRelations(long id)
         {
             return await GetElementRelations<Node>(id);
         }
 
-        /// <summary>
-        /// Gets the Relations containing a specific Way
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Relations_for_element:_GET_.2Fapi.2F0.6.2F.5Bnode.7Cway.7Crelation.5D.2F.23id.2Frelations">
-        /// GET /api/0.6/way/#id/relations</see>.
-        /// </summary>
+        /// <inheritdoc />
         public async Task<Relation[]> GetWayRelations(long id)
         {
             return await GetElementRelations<Way>(id);
         }
 
-        /// <summary>
-        /// Gets the Relations containing a specific Relation
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Relations_for_element:_GET_.2Fapi.2F0.6.2F.5Bnode.7Cway.7Crelation.5D.2F.23id.2Frelations">
-        /// GET /api/0.6/relation/#id/relations</see>.
-        /// </summary>
+        /// <inheritdoc />
         public async Task<Relation[]> GetRelationRelations(long id)
         {
             return await GetElementRelations<Relation>(id);
@@ -436,33 +327,25 @@ public async Task<Relation[]> GetRelationRelations(long id)
         private async Task<Relation[]> GetElementRelations<TOsmGeo>(long id) where TOsmGeo : OsmGeo, new()
         {
             var type = new TOsmGeo().Type.ToString().ToLower();
-            var address = BaseAddress + $"0.6/{type}/{id}/relations";
+            var address = _baseAddress + $"0.6/{type}/{id}/relations";
             var elements = await GetOfType<Relation>(address);
             return elements.ToArray();
         }
 
-        /// <summary>
-        /// Node Ways
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Ways_for_node:_GET_.2Fapi.2F0.6.2Fnode.2F.23id.2Fways">
-        /// GET /api/0.6/node/#id/ways</see>.
-        /// </summary>
+        /// <inheritdoc />
         public async Task<Way[]> GetNodeWays(long id)
         {
-            var address = BaseAddress + $"0.6/node/{id}/ways";
+            var address = _baseAddress + $"0.6/node/{id}/ways";
             var elements = await GetOfType<Way>(address);
             return elements.ToArray();
         }
         #endregion
 
         #region Changesets
-        /// <summary>
-        /// Changeset Read
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Read:_GET_.2Fapi.2F0.6.2Fchangeset.2F.23id.3Finclude_discussion.3Dtrue">
-        /// GET /api/0.6/changeset/#id?include_discussion=true</see>.
-        /// </summary>
+        /// <inheritdoc />
         public async Task<Changeset> GetChangeset(long changesetId, bool includeDiscussion = false)
         {
-            var address = BaseAddress + $"0.6/changeset/{changesetId}";
+            var address = _baseAddress + $"0.6/changeset/{changesetId}";
             if (includeDiscussion)
             {
                 address += "?include_discussion=true";
@@ -471,11 +354,7 @@ public async Task<Changeset> GetChangeset(long changesetId, bool includeDiscussi
             return osm.Changesets[0];
         }
 
-        /// <summary>
-        /// Changeset Query
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Query:_GET_.2Fapi.2F0.6.2Fchangesets">
-        /// GET /api/0.6/changesets</see>
-        /// </summary>
+        /// <inheritdoc />
         public async Task<Changeset[]> QueryChangesets(Bounds bounds, long? userId, string userName,
             DateTime? minClosedDate, DateTime? maxOpenedDate, bool openOnly, bool closedOnly,
             long[] ids)
@@ -497,119 +376,238 @@ public async Task<Changeset[]> QueryChangesets(Bounds bounds, long? userId, stri
             if (closedOnly) query["closed"] = "true";
             if (ids != null) query["changesets"] = string.Join(",", ids);
 
-            var address = BaseAddress + "0.6/changesets?" + query.ToString();
+            var address = _baseAddress + "0.6/changesets?" + query.ToString();
             var osm = await Get<Osm>(address);
             return osm.Changesets;
         }
 
-        /// <summary>
-        /// Changeset Download
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Read:_GET_.2Fapi.2F0.6.2Fchangeset.2F.23id.3Finclude_discussion.3Dtrue">
-        /// GET /api/0.6/changeset/#id/download</see>
-        /// </summary>
+        /// <inheritdoc />
         public async Task<OsmChange> GetChangesetDownload(long changesetId)
         {
-            return await Get<OsmChange>(BaseAddress + $"0.6/changeset/{changesetId}/download");
+            return await Get<OsmChange>(_baseAddress + $"0.6/changeset/{changesetId}/download");
         }
         #endregion
 
+        #region Changesets and Element Changes
+        /// <inheritdoc />
+        public async Task<long> CreateChangeset(TagsCollectionBase tags)
+        {
+            Validate.ContainsTags(tags, "comment", "created_by");
+            var address = _baseAddress + "0.6/changeset/create";
+            var changeSet = new Osm { Changesets = new[] { new Changeset { Tags = tags } } };
+            var content = new StringContent(changeSet.SerializeToXml());
+            var resultContent = await SendAuthRequest(HttpMethod.Put, address, content);
+            var id = await resultContent.ReadAsStringAsync();
+            return long.Parse(id);
+        }
+
+        /// <inheritdoc />
+        public async Task<Changeset> UpdateChangeset(long changesetId, TagsCollectionBase tags)
+        {
+            Validate.ContainsTags(tags, "comment", "created_by");
+            // TODO: Validate change meets OsmSharp.API.Capabilities?
+            var address = _baseAddress + $"0.6/changeset/{changesetId}";
+            var changeSet = new Osm { Changesets = new[] { new Changeset { Tags = tags } } };
+            var content = new StringContent(changeSet.SerializeToXml());
+            var osm = await Put<Osm>(address, content);
+            return osm.Changesets[0];
+        }
+
+        /// <inheritdoc />
+        public async Task<DiffResult> UploadChangeset(long changesetId, OsmChange osmChange)
+        {
+            var elements = new OsmGeo[][] { osmChange.Create, osmChange.Modify, osmChange.Delete }
+                .Where(c => c != null).SelectMany(c => c);
+
+            foreach (var osmGeo in elements)
+            {
+                osmGeo.ChangeSetId = changesetId;
+            }
+
+            var address = _baseAddress + $"0.6/changeset/{changesetId}/upload";
+            var request = new StringContent(osmChange.SerializeToXml());
+
+            return await Post<DiffResult>(address, request);
+        }
+
+        /// <inheritdoc />
+        public async Task<long> CreateElement(long changesetId, OsmGeo osmGeo)
+        {
+            var address = _baseAddress + $"0.6/{osmGeo.Type.ToString().ToLower()}/create";
+            var osmRequest = GetOsmRequest(changesetId, osmGeo);
+            var content = new StringContent(osmRequest.SerializeToXml());
+            var response = await SendAuthRequest(HttpMethod.Put, address, content);
+            var id = await response.ReadAsStringAsync();
+            return long.Parse(id);
+        }
+
+        /// <inheritdoc />
+        public async Task<long> UpdateElement(long changesetId, ICompleteOsmGeo osmGeo)
+        {
+            switch (osmGeo.Type)
+            {
+                case OsmGeoType.Node:
+                    return await UpdateElement(changesetId, osmGeo as OsmGeo);
+                case OsmGeoType.Way:
+                    return await UpdateElement(changesetId, ((CompleteWay)osmGeo).ToSimple());
+                case OsmGeoType.Relation:
+                    return await UpdateElement(changesetId, ((CompleteRelation)osmGeo).ToSimple());
+                default:
+                    throw new Exception($"Invalid OSM geometry type: {osmGeo.Type}");
+            }
+        }
+
+        /// <inheritdoc />
+        public async Task<long> UpdateElement(long changesetId, OsmGeo osmGeo)
+        {
+            Validate.ElementHasAVersion(osmGeo);
+            var address = _baseAddress + $"0.6/{osmGeo.Type.ToString().ToLower()}/{osmGeo.Id}";
+            var osmRequest = GetOsmRequest(changesetId, osmGeo);
+            var content = new StringContent(osmRequest.SerializeToXml());
+            var responseContent = await SendAuthRequest(HttpMethod.Put, address, content);
+            var newVersionNumber = await responseContent.ReadAsStringAsync();
+            return long.Parse(newVersionNumber);
+        }
+
+        /// <inheritdoc />
+        public async Task<long> DeleteElement(long changesetId, OsmGeo osmGeo)
+        {
+            Validate.ElementHasAVersion(osmGeo);
+            var address = _baseAddress + $"0.6/{osmGeo.Type.ToString().ToLower()}/{osmGeo.Id}";
+            var osmRequest = GetOsmRequest(changesetId, osmGeo);
+            var content = new StringContent(osmRequest.SerializeToXml());
+            var responseContent = await SendAuthRequest(HttpMethod.Delete, address, content);
+            var newVersionNumber = await responseContent.ReadAsStringAsync();
+            return long.Parse(newVersionNumber);
+        }
+
+        /// <inheritdoc />
+        public async Task CloseChangeset(long changesetId)
+        {
+            var address = _baseAddress + $"0.6/changeset/{changesetId}/close";
+            await SendAuthRequest(HttpMethod.Put, address, new StringContent(""));
+        }
+
+        /// <inheritdoc />
+        public async Task<Changeset> AddChangesetComment(long changesetId, string text)
+        {
+            var address = _baseAddress + $"0.6/changeset/{changesetId}/comment";
+            var content = new MultipartFormDataContent() { { new StringContent(text), "text" } };
+            var osm = await Post<Osm>(address, content);
+            return osm.Changesets[0];
+        }
+
+        /// <inheritdoc />
+        public async Task ChangesetSubscribe(long changesetId)
+        {
+            var address = _baseAddress + $"0.6/changeset/{changesetId}/subscribe";
+            await SendAuthRequest(HttpMethod.Post, address, new StringContent(""));
+        }
+
+        /// <inheritdoc />
+        public async Task ChangesetUnsubscribe(long changesetId)
+        {
+            var address = _baseAddress + $"0.6/changeset/{changesetId}/unsubscribe";
+            await SendAuthRequest(HttpMethod.Post, address, new StringContent(""));
+        }
+        #endregion
+        
         #region Traces
-        /// <summary>
-        /// Get GPS Points
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Get_GPS_Points:_Get_.2Fapi.2F0.6.2Ftrackpoints.3Fbbox.3Dleft.2Cbottom.2Cright.2Ctop.26page.3DpageNumber">
-        /// Get /api/0.6/trackpoints?bbox=left,bottom,right,top&page=pageNumber</see>.
-        /// Retrieve the GPS track points that are inside a given bounding box (formatted in a GPX format).
-        /// Warning: GPX version 1.0 is not the current version. Your tools might not support it.
-        /// </summary>
-        /// <returns>A stream of a GPX (version 1.0) file.</returns>
-        public virtual async Task<Stream> GetTrackPoints(Bounds bounds, int pageNumber = 0)
+        /// <inheritdoc />
+        public async Task<Stream> GetTrackPoints(Bounds bounds, int pageNumber = 0)
         {
-            var address = BaseAddress + $"0.6/trackpoints?bbox={ToString(bounds)}&page={pageNumber}";
+            var address = _baseAddress + $"0.6/trackpoints?bbox={ToString(bounds)}&page={pageNumber}";
             var content = await Get(address);
             var stream = await content.ReadAsStreamAsync();
             return stream;
         }
 
-        /// <summary>
-        /// Download Metadata
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Download_Metadata:_GET_.2Fapi.2F0.6.2Fgpx.2F.23id.2Fdetails">
-        /// GET /api/0.6/gpx/#id/details</see>.
-        /// </summary>
+        /// <inheritdoc />
         public async Task<GpxFile> GetTraceDetails(long id)
         {
-            var address = BaseAddress + $"0.6/gpx/{id}/details";
+            var address = _baseAddress + $"0.6/gpx/{id}/details";
             var osm = await Get<Osm>(address, c => AddAuthentication(c, address));
             return osm.GpxFiles[0];
         }
 
-        /// <summary>
-        /// Download Data
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Download_Data:_GET_.2Fapi.2F0.6.2Fgpx.2F.23id.2Fdata">
-        /// GET /api/0.6/gpx/#id/data</see>.
-        /// This will return exactly what was uploaded, which might not be a gpx file (it could be a zip etc.)
-        /// </summary>
-        /// <returns>A stream of a GPX (version 1.0) file.</returns>
+        /// <inheritdoc />
         public async Task<TypedStream> GetTraceData(long id)
         {
-            var address = BaseAddress + $"0.6/gpx/{id}/data";
+            var address = _baseAddress + $"0.6/gpx/{id}/data";
             var content = await Get(address, c => AddAuthentication(c, address));
             return await TypedStream.Create(content);
         }
+        
+        /// <inheritdoc />
+        public async Task<GpxFile[]> GetTraces()
+        {
+            var address = _baseAddress + "0.6/user/gpx_files";
+            var osm = await Get<Osm>(address, c => AddAuthentication(c, address));
+            return osm.GpxFiles ?? Array.Empty<GpxFile>();
+        }
+
+        /// <inheritdoc />
+        public async Task<long> CreateTrace(GpxFile gpx, Stream fileStream)
+        {
+            var address = _baseAddress + "0.6/gpx/create";
+            var form = new MultipartFormDataContent();
+            form.Add(new StringContent(gpx.Description), "\"description\"");
+            form.Add(new StringContent(gpx.Visibility.ToString().ToLower()), "\"visibility\"");
+            var tags = string.Join(",", gpx.Tags ?? Array.Empty<string>());
+            form.Add(new StringContent(tags), "\"tags\"");
+            var stream = new StreamContent(fileStream);
+            var cleanName = Encoding.ASCII.GetString(Encoding.ASCII.GetBytes(gpx.Name));
+            form.Add(stream, "file", cleanName);
+            var content = await SendAuthRequest(HttpMethod.Post, address, form);
+            var id = await content.ReadAsStringAsync();
+            return long.Parse(id);
+        }
+
+        /// <inheritdoc />
+        public async Task UpdateTrace(GpxFile trace)
+        {
+            var address = _baseAddress + $"0.6/gpx/{trace.Id}";
+            var osm = new Osm { GpxFiles = new[] { trace } };
+            var content = new StringContent(osm.SerializeToXml());
+            await SendAuthRequest(HttpMethod.Put, address, content);
+        }
+
+        /// <inheritdoc />
+        public async Task DeleteTrace(long traceId)
+        {
+            var address = _baseAddress + $"0.6/gpx/{traceId}";
+            await SendAuthRequest(HttpMethod.Delete, address, null);
+        }
         #endregion
 
         #region Notes
-        /// <summary>
-        /// Gets a Note
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Read:_GET_.2Fapi.2F0.6.2Fnotes.2F.23id">
-        /// GET /api/0.6/notes/#id</see>.
-        /// </summary>
+        /// <inheritdoc />
         public async Task<Note> GetNote(long id)
         {
-            var address = BaseAddress + $"0.6/notes/{id}";
+            var address = _baseAddress + $"0.6/notes/{id}";
             var osm = await Get<Osm>(address);
             return osm.Notes?.FirstOrDefault();
         }
 
-        /// <summary>
-        /// Gets many a Notes in a box and with the spcified time since closed
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Retrieving_notes_data_by_bounding_box:_GET_.2Fapi.2F0.6.2Fnotes">
-        /// GET /api/0.6/notes?[parameters]</see>.
-        /// </summary>
-        /// <param name="limit">Must be between 1 and 10,000.</param>
-        /// <param name="maxClosedDays">0 means only open notes. -1 mean all (open and closed) notes.</param>
+        /// <inheritdoc />
         public async Task<Note[]> GetNotes(Bounds bounds, int limit = 100, int maxClosedDays = 7)
         {
             string format = ".xml";
-            var address = BaseAddress + $"0.6/notes{format}?bbox={ToString(bounds)}&limit={limit}&closed={maxClosedDays}";
+            var address = _baseAddress + $"0.6/notes{format}?bbox={ToString(bounds)}&limit={limit}&closed={maxClosedDays}";
             var osm = await Get<Osm>(address);
             return osm.Notes;
         }
 
-        /// <summary>
-        /// Gets an RSS feed of Notes in an area
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#RSS_Feed:_GET_.2Fapi.2F0.6.2Fnotes.2Ffeed">
-        /// GET /api/0.6/notes/feed</see>.
-        /// </summary>
+        /// <inheritdoc />
         public async Task<Stream> GetNotesRssFeed(Bounds bounds)
         {
-            var address = BaseAddress + $"0.6/notes/feed?bbox={ToString(bounds)}";
+            var address = _baseAddress + $"0.6/notes/feed?bbox={ToString(bounds)}";
             var content = await Get(address);
             var stream = await content.ReadAsStreamAsync();
             return stream;
         }
 
-        /// <summary>
-        /// Search for Notes
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Search_for_notes:_GET_.2Fapi.2F0.6.2Fnotes.2Fsearch">
-        /// GET /api/0.6/notes/search</see>.
-        /// </summary>
-        /// <param name="searchText">Specifies the search query. This is the only required field.</param>
-        /// <param name="userId">Specifies the creator of the returned notes by the id of the user. Does not work together with the display_name parameter</param>
-        /// <param name="userName">Specifies the creator of the returned notes by the display name. Does not work together with the user parameter</param>
-        /// <param name="limit">Must be between 1 and 10,000. 100 is default if null.</param>
-        /// <param name="maxClosedDays">0 means only open notes. -1 mean all (open and closed) notes. 7 is default if null.</param>
-        /// <param name="fromDate">Specifies the beginning of a date range to search in for a note</param>
-        /// <param name="toDate">Specifies the end of a date range to search in for a note</param>
+        /// <inheritdoc />
         public async Task<Note[]> QueryNotes(string searchText, long? userId, string userName,
             int? limit, int? maxClosedDays, DateTime? fromDate, DateTime? toDate)
         {
@@ -630,7 +628,7 @@ public async Task<Note[]> QueryNotes(string searchText, long? userId, string use
             if (toDate != null) query["to"] = FormatNoteDate(toDate.Value);
 
             string format = ".xml";
-            var address = BaseAddress + $"0.6/notes/search{format}?{query}";
+            var address = _baseAddress + $"0.6/notes/search{format}?{query}";
             var osm = await Get<Osm>(address);
             return osm.Notes;
         }
@@ -641,11 +639,7 @@ private static string FormatNoteDate(DateTime date)
             return date.ToString("yyyy-MM-dd HH:mm:ss") + " UTC";
         }
 
-        /// <summary>
-        /// Creates a new Note
-        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Create_a_new_note:_Create:_POST_.2Fapi.2F0.6.2Fnotes">
-        /// POST /api/0.6/notes</see>.
-        /// </summary>
+        /// <inheritdoc />
         public async Task<Note> CreateNote(double latitude, double longitude, string text)
         {
             var query = HttpUtility.ParseQueryString(string.Empty);
@@ -653,52 +647,56 @@ public async Task<Note> CreateNote(double latitude, double longitude, string tex
             query["lat"] = ToString(latitude);
             query["lon"] = ToString(longitude);
 
-            var address = BaseAddress + $"0.6/notes?{query}";
+            var address = _baseAddress + $"0.6/notes?{query}";
             // Can be with Auth or without.
             var osm = await Post<Osm>(address);
             return osm.Notes[0];
         }
-        #endregion
-
-        protected async Task<IEnumerable<T>> GetOfType<T>(string address, Action<HttpRequestMessage> auth = null) where T : class
+        
+        /// <inheritdoc />
+        public async Task<Note> CommentNote(long noteId, string text)
         {
-            var content = await Get(address, auth);
-            var streamSource = new XmlOsmStreamSource(await content.ReadAsStreamAsync());
-            var elements = streamSource.OfType<T>();
-            return elements;
+            var query = HttpUtility.ParseQueryString(string.Empty);
+            query["text"] = text;
+            var address = _baseAddress + $"0.6/notes/{noteId}/comment?{query}";
+            // Can be with Auth or without.
+            var osm = await Post<Osm>(address);
+            return osm.Notes[0];
         }
 
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public string ToString(Bounds bounds)
+        /// <inheritdoc />
+        public async Task<Note> CloseNote(long noteId, string text)
         {
-            StringBuilder x = new StringBuilder();
-            x.Append(bounds.MinLongitude.Value.ToString(OsmMaxPrecision, CultureInfo.InvariantCulture));
-            x.Append(',');
-            x.Append(bounds.MinLatitude.Value.ToString(OsmMaxPrecision, CultureInfo.InvariantCulture));
-            x.Append(',');
-            x.Append(bounds.MaxLongitude.Value.ToString(OsmMaxPrecision, CultureInfo.InvariantCulture));
-            x.Append(',');
-            x.Append(bounds.MaxLatitude.Value.ToString(OsmMaxPrecision, CultureInfo.InvariantCulture));
-
-            return x.ToString();
+            var query = HttpUtility.ParseQueryString(string.Empty);
+            query["text"] = text;
+            var address = _baseAddress + $"0.6/notes/{noteId}/close?{query}";
+            var osm = await Post<Osm>(address);
+            return osm.Notes[0];
         }
 
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public string ToString(float number)
+        /// <inheritdoc />
+        public async Task<Note> ReOpenNote(long noteId, string text)
         {
-            return number.ToString(OsmMaxPrecision, CultureInfo.InvariantCulture);
+            var query = HttpUtility.ParseQueryString(string.Empty);
+            query["text"] = text;
+            var address = _baseAddress + $"0.6/notes/{noteId}/reopen?{query}";
+            var osm = await Post<Osm>(address);
+            return osm.Notes[0];
         }
+        #endregion
 
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public string ToString(double number)
+        #region Http
+        private static readonly Func<string, string> Encode = HttpUtility.UrlEncode;
+        
+        private void AddAuthentication(HttpRequestMessage message, string url, string method = "GET")
         {
-            return number.ToString(OsmMaxPrecision, CultureInfo.InvariantCulture);
+            if (!string.IsNullOrEmpty(_token))
+            {
+                message.Headers.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", this._token);    
+            }
         }
-
-        #region Http
-        protected static readonly Func<string, string> Encode = HttpUtility.UrlEncode;
-
-        protected async Task<T> Get<T>(string address, Action<HttpRequestMessage> auth = null) where T : class
+        
+        private async Task<T> Get<T>(string address, Action<HttpRequestMessage> auth = null) where T : class
         {
             var content = await Get(address, auth);
             var stream = await content.ReadAsStreamAsync();
@@ -707,18 +705,18 @@ protected async Task<T> Get<T>(string address, Action<HttpRequestMessage> auth =
             return element;
         }
 
-        protected async Task<HttpContent> Get(string address, Action<HttpRequestMessage> auth = null)
+        private async Task<HttpContent> Get(string address, Action<HttpRequestMessage> auth = null)
         {
             using (HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, address))
             {
                 auth?.Invoke(request);
                 var response = await _httpClient.SendAsync(request);
-                await VerifyAndLogReponse(response, $"{GetType().Name} GET: {address}");
+                await VerifyAndLogResponse(response, $"{GetType().Name} GET: {address}");
                 return response.Content;
             }
         }
 
-        protected async Task<T> Post<T>(string address, HttpContent requestContent = null) where T : class
+        private async Task<T> Post<T>(string address, HttpContent requestContent = null) where T : class
         {
             var responseContent = await SendAuthRequest(HttpMethod.Post, address, requestContent);
             var stream = await responseContent.ReadAsStreamAsync();
@@ -727,7 +725,7 @@ protected async Task<T> Post<T>(string address, HttpContent requestContent = nul
             return content;
         }
 
-        protected async Task<T> Put<T>(string address, HttpContent requestContent = null) where T : class
+        private async Task<T> Put<T>(string address, HttpContent requestContent = null) where T : class
         {
             var content = await SendAuthRequest(HttpMethod.Put, address, requestContent);
             var stream = await content.ReadAsStreamAsync();
@@ -736,27 +734,19 @@ protected async Task<T> Put<T>(string address, HttpContent requestContent = null
             return element;
         }
 
-        /// <summary>
-        /// For GetTraceDetails() and GetTraceData(), which may be authenticated or not.
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="url"></param>
-        /// <param name="method"></param>
-        protected virtual void AddAuthentication(HttpRequestMessage message, string url, string method = "GET") { }
-
-        protected async Task<HttpContent> SendAuthRequest(HttpMethod method, string address, HttpContent requestContent)
+        private async Task<HttpContent> SendAuthRequest(HttpMethod method, string address, HttpContent requestContent)
         {
             using (HttpRequestMessage request = new HttpRequestMessage(method, address))
             {
                 AddAuthentication(request, address, method.ToString());
                 request.Content = requestContent;
                 var response = await _httpClient.SendAsync(request);
-                await VerifyAndLogReponse(response, $"{GetType().Name} {method}: {address}");
+                await VerifyAndLogResponse(response, $"{GetType().Name} {method}: {address}");
                 return response.Content;
             }
         }
 
-        protected async Task VerifyAndLogReponse(HttpResponseMessage response, string logMessage)
+        private async Task VerifyAndLogResponse(HttpResponseMessage response, string logMessage)
         {
             if (!response.IsSuccessStatusCode)
             {
@@ -770,6 +760,143 @@ protected async Task VerifyAndLogReponse(HttpResponseMessage response, string lo
             }
         }
         #endregion
+        
+        #region Users
+        /// <summary>
+        /// Details of a User
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Details_of_a_user">
+        /// GET /api/0.6/user/#id</see>.
+        /// </summary>
+        public async Task<User> GetUser(long id)
+        {
+            var address = _baseAddress + $"0.6/user/{id}";
+            var osm = await Get<Osm>(address);
+            return osm.User;
+        }
+
+        /// <summary>
+        /// Details of multiple Users
+        /// <see href="https://wiki.openstreetmap.org/wiki/API_v0.6#Details_of_multiple_users">
+        /// GET /api/0.6/users?users=#id1,#id2,...,#idn</see>.
+        /// </summary>
+        public async Task<User[]> GetUsers(params long[] ids)
+        {
+            var address = _baseAddress + $"0.6/users?users={string.Join(",", ids)}";
+            var osm = await Get<Osm>(address);
+            return osm.Users;
+        }
+        
+        /// <inheritdoc />
+        public async Task<Permissions> GetPermissions()
+        {
+            var address = _baseAddress + "0.6/permissions";
+            var osm = await Get<Osm>(address, c => AddAuthentication(c, address));
+            return osm.Permissions;
+        }
+
+        /// <inheritdoc />
+        public async Task<User> GetUserDetails()
+        {
+            var address = _baseAddress + "0.6/user/details";
+            var osm = await Get<Osm>(address, c => AddAuthentication(c, address));
+            return osm.User;
+        }
+
+        /// <inheritdoc />
+        public async Task<Preference[]> GetUserPreferences()
+        {
+            var address = _baseAddress + "0.6/user/preferences";
+            var osm = await Get<Osm>(address, c => AddAuthentication(c, address));
+            return osm.Preferences.UserPreferences;
+        }
+
+        /// <inheritdoc />
+        public async Task SetUserPreferences(Preferences preferences)
+        {
+            var address = _baseAddress + "0.6/user/preferences";
+            var osm = new Osm() { Preferences = preferences };
+            var content = new StringContent(osm.SerializeToXml());
+            await SendAuthRequest(HttpMethod.Put, address, content);
+        }
+
+        /// <inheritdoc />
+        public async Task<string> GetUserPreference(string key)
+        {
+            var address = _baseAddress + $"0.6/user/preferences/{Encode(key)}";
+            var content = await Get(address, c => AddAuthentication(c, address));
+            var value = await content.ReadAsStringAsync();
+            return value;
+        }
+
+        /// <inheritdoc />
+        public async Task SetUserPreference(string key, string value)
+        {
+            var address = _baseAddress + $"0.6/user/preferences/{Encode(key)}";
+            var content = new StringContent(value);
+            await SendAuthRequest(HttpMethod.Put, address, content);
+        }
+
+        /// <inheritdoc />
+        public async Task DeleteUserPreference(string key)
+        {
+            var address = _baseAddress + $"0.6/user/preferences/{Encode(key)}";
+            await SendAuthRequest(HttpMethod.Delete, address, null);
+        }
+        #endregion
+        
+        private Osm GetOsmRequest(long changesetId, OsmGeo osmGeo)
+        {
+            osmGeo.ChangeSetId = changesetId;
+            var osm = new Osm();
+            switch (osmGeo.Type)
+            {
+                case OsmGeoType.Node:
+                    osm.Nodes = new[] { osmGeo as Node };
+                    break;
+                case OsmGeoType.Way:
+                    osm.Ways = new[] { osmGeo as Way };
+                    break;
+                case OsmGeoType.Relation:
+                    osm.Relations = new[] { osmGeo as Relation };
+                    break;
+            }
+            return osm;
+        }
+        
+        private async Task<IEnumerable<T>> GetOfType<T>(string address, Action<HttpRequestMessage> auth = null) where T : class
+        {
+            var content = await Get(address, auth);
+            var streamSource = new XmlOsmStreamSource(await content.ReadAsStreamAsync());
+            var elements = streamSource.OfType<T>();
+            return elements;
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public string ToString(Bounds bounds)
+        {
+            StringBuilder x = new StringBuilder();
+            x.Append(bounds.MinLongitude.Value.ToString(OsmMaxPrecision, CultureInfo.InvariantCulture));
+            x.Append(',');
+            x.Append(bounds.MinLatitude.Value.ToString(OsmMaxPrecision, CultureInfo.InvariantCulture));
+            x.Append(',');
+            x.Append(bounds.MaxLongitude.Value.ToString(OsmMaxPrecision, CultureInfo.InvariantCulture));
+            x.Append(',');
+            x.Append(bounds.MaxLatitude.Value.ToString(OsmMaxPrecision, CultureInfo.InvariantCulture));
+
+            return x.ToString();
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public string ToString(float number)
+        {
+            return number.ToString(OsmMaxPrecision, CultureInfo.InvariantCulture);
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public string ToString(double number)
+        {
+            return number.ToString(OsmMaxPrecision, CultureInfo.InvariantCulture);
+        }
     }
 }
 
diff --git a/OsmSharp.IO.API/OsmSharp.IO.API.csproj b/OsmSharp.IO.API/OsmSharp.IO.API.csproj
index 6dc65da..df30474 100644
--- a/OsmSharp.IO.API/OsmSharp.IO.API.csproj
+++ b/OsmSharp.IO.API/OsmSharp.IO.API.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <PackageId>OsmSharp.IO.API</PackageId>
-    <Version>1.0.4</Version>
-    <AssemblyVersion>1.0.4</AssemblyVersion>
-    <FileVersion>1.0.4</FileVersion>
+    <Version>1.0.5</Version>
+    <AssemblyVersion>1.0.5</AssemblyVersion>
+    <FileVersion>1.0.5</FileVersion>
     <RepositoryUrl>https://github.com/OsmSharp/io-api</RepositoryUrl>
     <PackageProjectUrl>https://github.com/OsmSharp/io-api</PackageProjectUrl>
     <IconUrl>https://www.osmsharp.com/logos/osmsharp_logo64.png</IconUrl>
@@ -15,7 +15,7 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <Copyright>Copyright 2023 Alex Hennings &amp; Harel Mazor</Copyright>
+    <Copyright>Copyright 2025 Alex Hennings &amp; Harel Mazor</Copyright>
     <Authors>Alex Hennings &amp; Harel Mazor</Authors>
     <RepositoryType>git</RepositoryType>
     <RootNamespace>OsmSharp.IO.API</RootNamespace>
@@ -24,14 +24,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="..\README.md" Pack="true" PackagePath=""/>
+    <None Include="..\README.md" Pack="true" PackagePath="" />
     
   </ItemGroup>
   
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.2" />
-    <PackageReference Include="OAuth.DotNetCore" Version="3.0.1" />
     <PackageReference Include="OsmSharp" Version="7.0.0-pre022" />
   </ItemGroup>
 
diff --git a/README.md b/README.md
index 24e9cb9..0cd6757 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Pull requests are welcome. You will need VisualStudio, VS Code or Rider to modif
 
 ### Features
 - Supports Logging using ILogger
-- Supports Authentication with username and password, OAuth 1 and OAuth 2
+- Supports Authentication with OAuth 2
 - Supports every documented operation of the Osm Api v0.6
 - Is thread safe
 
@@ -26,9 +26,9 @@ var client = clientFactory.CreateNonAuthClient();
 var node = await client.GetNode(100);
 ```
 
-### Delete a Node (map changes require BasicAuth or OAuth)
+### Delete a Node (map changes require OAuth)
 ```c#
-var authClient = clientFactory.CreateBasicAuthClient("username", "password");
+var authClient = clientFactory.CreateOAuth2Client("oAuth-token");
 var changeSetTags = new TagsCollection() { new Tag("comment", "Deleting a node.") };
 var changeSetId = await client.CreateChangeset(changeSetTags);
 node.Version = await client.DeleteElement(changeSetId, node);