diff --git a/DiscordRPC/DiscordRpcClient.cs b/DiscordRPC/DiscordRpcClient.cs
index 80ac2a5d..4240f771 100644
--- a/DiscordRPC/DiscordRpcClient.cs
+++ b/DiscordRPC/DiscordRpcClient.cs
@@ -333,10 +333,10 @@ private void ProcessMessage(IMessage message)
                         //Resend our presence and subscription
                         SynchronizeState();
                     }
-                   
+
                     if (OnReady != null) 
                         OnReady.Invoke(this, message as ReadyMessage);
-                 
+
                     break;
 
                 case MessageType.Close:
@@ -366,8 +366,8 @@ private void ProcessMessage(IMessage message)
                     {
                         var sub = message as SubscribeMessage;
                         Subscription |= sub.Event;
-                    }   
-                    
+                    }
+
                     if (OnSubscribe != null) 
                         OnSubscribe.Invoke(this, message as SubscribeMessage);
 
@@ -483,169 +483,91 @@ public void SetPresence(RichPresence presence)
         #region Updates
 
         /// <summary>
-        /// Updates only the <see cref="RichPresence.Buttons"/> of the <see cref="CurrentPresence"/> and updates/removes the buttons. Returns the newly edited Rich Presence.
+        /// The update function delegate
         /// </summary>
-        /// <param name="button">The buttons of the Rich Presence</param>
+        public delegate void UpdateFunc(ref RichPresence presence);
+
+        /// <summary>
+        /// Updates the values assigned in the delegate passed
+        /// </summary>
+        /// <param name="func">Delegate used to update the rich presence</param>
         /// <returns>Updated Rich Presence</returns>
-        public RichPresence UpdateButtons(Button[] button = null)
+        public RichPresence Update(UpdateFunc func)
         {
             if (!IsInitialized)
-            {
                 throw new UninitializedException();
-            }
 
             // Clone the presence
             RichPresence presence;
             lock (_sync)
             {
-                if (CurrentPresence == null)
-                {
-                    presence = new RichPresence();
-                }
-                else
-                {
-                    presence = CurrentPresence.Clone();
-                }
+                presence = CurrentPresence == null ? new RichPresence() : CurrentPresence.Clone();
             }
 
-            // Update the buttons.
-            presence.Buttons = button;
+            func(ref presence);
             SetPresence(presence);
 
             return presence;
         }
 
+        /// <summary>
+        /// Updates only the <see cref="BaseRichPresence.Type"/> of the <see cref="CurrentPresence"/> and sends the updated presence to Discord. Returns the newly edited Rich Presence.
+        /// </summary>
+        /// <param name="type">The type of the Rich Presence</param>
+        /// <returns>Updated Rich Presence</returns>
+        public RichPresence UpdateType(ActivityType type) => Update((ref RichPresence p) => p.Type = type);
+
+        /// <summary>
+        /// Updates only the <see cref="RichPresence.Buttons"/> of the <see cref="CurrentPresence"/> and updates/removes the buttons. Returns the newly edited Rich Presence.
+        /// </summary>
+        /// <param name="buttons">The buttons of the Rich Presence</param>
+        /// <returns>Updated Rich Presence</returns>
+        public RichPresence UpdateButtons(Button[] buttons = null) => Update((ref RichPresence p) => p.Buttons = buttons);
+
         /// <summary>
         /// Updates only the <see cref="RichPresence.Buttons"/> of the <see cref="CurrentPresence"/> and updates the button with the given index. Returns the newly edited Rich Presence.
         /// </summary>
         /// <param name="button">The buttons of the Rich Presence</param>
         /// <param name="index">The number of the button</param>
         /// <returns>Updated Rich Presence</returns>
-        public RichPresence SetButton(Button button, int index = 0)
-        {
-            if (!IsInitialized)
-            {
-                throw new UninitializedException();
-            }
-
-            // Clone the presence
-            RichPresence presence;
-            lock (_sync)
-            {
-                if (CurrentPresence == null)
-                {
-                    presence = new RichPresence();
-                }
-                else
-                {
-                    presence = CurrentPresence.Clone();
-                }
-            }
-
-            // Update the buttons
-            presence.Buttons[index] = button;
-            SetPresence(presence);
-
-            return presence;
-        }
+        public RichPresence SetButton(Button button, int index = 0) => Update((ref RichPresence p) => p.Buttons[index] = button);
 
         /// <summary>
         /// Updates only the <see cref="BaseRichPresence.Details"/> of the <see cref="CurrentPresence"/> and sends the updated presence to Discord. Returns the newly edited Rich Presence.
         /// </summary>
         /// <param name="details">The details of the Rich Presence</param>
         /// <returns>Updated Rich Presence</returns>
-        public RichPresence UpdateDetails(string details)
-        {
-            if (!IsInitialized)
-                throw new UninitializedException();
-
-            //Clone the presence
-            RichPresence presence;
-            lock (_sync)
-            {
-                if (CurrentPresence == null) { presence = new RichPresence(); }
-                else { presence = CurrentPresence.Clone(); }
-            }
+        public RichPresence UpdateDetails(string details) => Update((ref RichPresence p) => p.Details = details);
 
-            //Update the value 
-            presence.Details = details;
-            SetPresence(presence);
-            return presence;
-        }
         /// <summary>
         /// Updates only the <see cref="BaseRichPresence.State"/> of the <see cref="CurrentPresence"/> and sends the updated presence to Discord. Returns the newly edited Rich Presence.
         /// </summary>
         /// <param name="state">The state of the Rich Presence</param>
         /// <returns>Updated Rich Presence</returns>
-        public RichPresence UpdateState(string state)
-        {
-            if (!IsInitialized)
-                throw new UninitializedException();
+        public RichPresence UpdateState(string state) => Update((ref RichPresence p) => p.State = state);
 
-            //Clone the presence
-            RichPresence presence;
-            lock (_sync)
-            {
-                if (CurrentPresence == null) { presence = new RichPresence(); }
-                else { presence = CurrentPresence.Clone(); }
-            }
-
-            //Update the value 
-            presence.State = state;
-            SetPresence(presence);
-            return presence;
-        }
         /// <summary>
         /// Updates only the <see cref="BaseRichPresence.Party"/> of the <see cref="CurrentPresence"/> and sends the updated presence to Discord. Returns the newly edited Rich Presence.
         /// </summary>
         /// <param name="party">The party of the Rich Presence</param>
         /// <returns>Updated Rich Presence</returns>
-        public RichPresence UpdateParty(Party party)
-        {
-            if (!IsInitialized)
-                throw new UninitializedException();
-
-            //Clone the presence
-            RichPresence presence;
-            lock (_sync)
-            {
-                if (CurrentPresence == null) { presence = new RichPresence(); }
-                else { presence = CurrentPresence.Clone(); }
-            }
+        public RichPresence UpdateParty(Party party) => Update((ref RichPresence p) => p.Party = party);
 
-            //Update the value 
-            presence.Party = party;
-            SetPresence(presence);
-            return presence;
-        }
         /// <summary>
         /// Updates the <see cref="Party.Size"/> of the <see cref="CurrentPresence"/> and sends the update presence to Discord. Returns the newly edited Rich Presence.
         /// <para>Will return null if no presence exists and will throw a new <see cref="NullReferenceException"/> if the Party does not exist.</para>
         /// </summary>
         /// <param name="size">The new size of the party. It cannot be greater than <see cref="Party.Max"/></param>
         /// <returns>Updated Rich Presence</returns>
-        public RichPresence UpdatePartySize(int size)
+        public RichPresence UpdatePartySize(int size) => Update((ref RichPresence p) =>
         {
-            if (!IsInitialized)
-                throw new UninitializedException();
-
-            //Clone the presence
-            RichPresence presence;
-            lock (_sync)
-            {
-                if (CurrentPresence == null) { presence = new RichPresence(); }
-                else { presence = CurrentPresence.Clone(); }
-            }
-
-            //Ensure it has a party
-            if (presence.Party == null)
+            // Ensure we have a party going on
+            if (p.Party == null)
                 throw new BadPresenceException("Cannot set the size of the party if the party does not exist");
 
-            //Update the value 
-            presence.Party.Size = size;
-            SetPresence(presence);
-            return presence;
-        }
+            // Update the size
+            p.Party.Size = size;
+        });
 
         /// <summary>
         /// Updates the <see cref="Party.Size"/> of the <see cref="CurrentPresence"/> and sends the update presence to Discord. Returns the newly edited Rich Presence.
@@ -654,29 +576,15 @@ public RichPresence UpdatePartySize(int size)
         /// <param name="size">The new size of the party. It cannot be greater than <see cref="Party.Max"/></param>
         /// <param name="max">The new size of the party. It cannot be smaller than <see cref="Party.Size"/></param>
         /// <returns>Updated Rich Presence</returns>
-        public RichPresence UpdatePartySize(int size, int max)
+        public RichPresence UpdatePartySize(int size, int max) => Update((ref RichPresence p) =>
         {
-            if (!IsInitialized)
-                throw new UninitializedException();
-
-            //Clone the presence
-            RichPresence presence;
-            lock (_sync)
-            {
-                if (CurrentPresence == null) { presence = new RichPresence(); }
-                else { presence = CurrentPresence.Clone(); }
-            }
-
-            //Ensure it has a party
-            if (presence.Party == null)
+            // Ensure we have a party going on
+            if (p.Party == null)
                 throw new BadPresenceException("Cannot set the size of the party if the party does not exist");
 
-            //Update the value 
-            presence.Party.Size = size;
-            presence.Party.Max = max;
-            SetPresence(presence);
-            return presence;
-        }
+            p.Party.Size = size;
+            p.Party.Max = max;
+        });
 
         /// <summary>
         /// Updates the large <see cref="Assets"/> of the <see cref="CurrentPresence"/> and sends the updated presence to Discord. Both <paramref name="key"/> and <paramref name="tooltip"/> are optional and will be ignored it null.
@@ -684,25 +592,14 @@ public RichPresence UpdatePartySize(int size, int max)
         /// <param name="key">Optional: The new key to set the asset too</param>
         /// <param name="tooltip">Optional: The new tooltip to display on the asset</param>
         /// <returns>Updated Rich Presence</returns>
-        public RichPresence UpdateLargeAsset(string key = null, string tooltip = null)
+        public RichPresence UpdateLargeAsset(string key = null, string tooltip = null) => Update((ref RichPresence p) =>
         {
-            if (!IsInitialized)
-                throw new UninitializedException();
-            //Clone the presence
-            RichPresence presence;
-            lock (_sync)
-            {
-                if (CurrentPresence == null) { presence = new RichPresence(); }
-                else { presence = CurrentPresence.Clone(); }
-            }
+            if (p.Assets == null)
+                p.Assets = new Assets();
 
-            //Update the value 
-            if (presence.Assets == null) presence.Assets = new Assets();
-            presence.Assets.LargeImageKey = key ?? presence.Assets.LargeImageKey;
-            presence.Assets.LargeImageText = tooltip ?? presence.Assets.LargeImageText;
-            SetPresence(presence);
-            return presence;
-        }
+            p.Assets.LargeImageKey = key ?? p.Assets.LargeImageKey;
+            p.Assets.LargeImageText = tooltip ?? p.Assets.LargeImageText;
+        });
 
         /// <summary>
         /// Updates the small <see cref="Assets"/> of the <see cref="CurrentPresence"/> and sends the updated presence to Discord. Both <paramref name="key"/> and <paramref name="tooltip"/> are optional and will be ignored it null.
@@ -710,134 +607,66 @@ public RichPresence UpdateLargeAsset(string key = null, string tooltip = null)
         /// <param name="key">Optional: The new key to set the asset too</param>
         /// <param name="tooltip">Optional: The new tooltip to display on the asset</param>
         /// <returns>Updated Rich Presence</returns>
-        public RichPresence UpdateSmallAsset(string key = null, string tooltip = null)
+        public RichPresence UpdateSmallAsset(string key = null, string tooltip = null) => Update((ref RichPresence p) =>
         {
-            if (!IsInitialized)
-                throw new UninitializedException();
-            //Clone the presence
-            RichPresence presence;
-            lock (_sync)
-            {
-                if (CurrentPresence == null) { presence = new RichPresence(); }
-                else { presence = CurrentPresence.Clone(); }
-            }
+            if (p.Assets == null)
+                p.Assets = new Assets();
 
-            //Update the value 
-            if (presence.Assets == null) presence.Assets = new Assets();
-            presence.Assets.SmallImageKey = key ?? presence.Assets.SmallImageKey;
-            presence.Assets.SmallImageText = tooltip ?? presence.Assets.SmallImageText;
-            SetPresence(presence);
-            return presence;
-        }
+            p.Assets.SmallImageKey = key ?? p.Assets.SmallImageKey;
+            p.Assets.SmallImageText = tooltip ?? p.Assets.SmallImageText;
+        });
 
         /// <summary>
         /// Updates the <see cref="Secrets"/> of the <see cref="CurrentPresence"/> and sends the updated presence to Discord. Will override previous secret entirely.
         /// </summary>
         /// <param name="secrets">The new secret to send to discord.</param>
         /// <returns>Updated Rich Presence</returns>
-        public RichPresence UpdateSecrets(Secrets secrets)
-        {
-            if (!IsInitialized)
-                throw new UninitializedException();
-
-            //Clone the presence
-            RichPresence presence;
-            lock (_sync)
-            {
-                if (CurrentPresence == null) { presence = new RichPresence(); }
-                else { presence = CurrentPresence.Clone(); }
-            }
-
-            //Update the value 
-            presence.Secrets = secrets;
-            SetPresence(presence);
-            return presence;
-        }
+        public RichPresence UpdateSecrets(Secrets secrets) => Update((ref RichPresence p) => p.Secrets = secrets);
 
         /// <summary>
         /// Sets the start time of the <see cref="CurrentPresence"/> to now and sends the updated presence to Discord.
         /// </summary>
         /// <returns>Updated Rich Presence</returns>
-        public RichPresence UpdateStartTime() { return UpdateStartTime(DateTime.UtcNow); }
+        public RichPresence UpdateStartTime() => UpdateStartTime(DateTime.UtcNow);
 
         /// <summary>
         /// Sets the start time of the <see cref="CurrentPresence"/> and sends the updated presence to Discord.
         /// </summary>
         /// <param name="time">The new time for the start</param>
         /// <returns>Updated Rich Presence</returns>
-        public RichPresence UpdateStartTime(DateTime time)
+        public RichPresence UpdateStartTime(DateTime time) => Update((ref RichPresence p) =>
         {
-            if (!IsInitialized)
-                throw new UninitializedException();
+            if (p.Timestamps == null)
+                p.Timestamps = new Timestamps();
 
-            //Clone the presence
-            RichPresence presence;
-            lock (_sync)
-            {
-                if (CurrentPresence == null) { presence = new RichPresence(); }
-                else { presence = CurrentPresence.Clone(); }
-            }
-
-            //Update the value 
-            if (presence.Timestamps == null) presence.Timestamps = new Timestamps();
-            presence.Timestamps.Start = time;
-            SetPresence(presence);
-            return presence;
-        }
+            p.Timestamps.Start = time;
+        });
 
         /// <summary>
         /// Sets the end time of the <see cref="CurrentPresence"/> to now and sends the updated presence to Discord.
         /// </summary>
         /// <returns>Updated Rich Presence</returns>
-        public RichPresence UpdateEndTime() { return UpdateEndTime(DateTime.UtcNow); }
+        public RichPresence UpdateEndTime() => UpdateEndTime(DateTime.UtcNow);
 
         /// <summary>
         /// Sets the end time of the <see cref="CurrentPresence"/> and sends the updated presence to Discord.
         /// </summary>
         /// <param name="time">The new time for the end</param>
         /// <returns>Updated Rich Presence</returns>
-        public RichPresence UpdateEndTime(DateTime time)
+        public RichPresence UpdateEndTime(DateTime time) => Update((ref RichPresence p) =>
         {
-            if (!IsInitialized)
-                throw new UninitializedException();
+            if (p.Timestamps == null)
+                p.Timestamps = new Timestamps();
 
-            //Clone the presence
-            RichPresence presence;
-            lock (_sync)
-            {
-                if (CurrentPresence == null) { presence = new RichPresence(); }
-                else { presence = CurrentPresence.Clone(); }
-            }
-
-            //Update the value 
-            if (presence.Timestamps == null) presence.Timestamps = new Timestamps();
-            presence.Timestamps.End = time;
-            SetPresence(presence);
-            return presence;
-        }
+            p.Timestamps.End = time;
+        });
 
         /// <summary>
         /// Sets the start and end time of <see cref="CurrentPresence"/> to null and sends it to Discord.
         /// </summary>
         /// <returns>Updated Rich Presence</returns>
-        public RichPresence UpdateClearTime()
-        {
-            if (!IsInitialized)
-                throw new UninitializedException();
+        public RichPresence UpdateClearTime() => Update((ref RichPresence p) => p.Timestamps = null);
 
-            //Clone the presence
-            RichPresence presence;
-            lock (_sync)
-            {
-                if (CurrentPresence == null) { presence = new RichPresence(); }
-                else { presence = CurrentPresence.Clone(); }
-            }
-
-            //Update the value 
-            presence.Timestamps = null;
-            SetPresence(presence);
-            return presence;
-        }
         #endregion
 
         /// <summary>