diff --git a/Interfaces/IXTagProvider.cs b/Interfaces/IXTagProvider.cs
index 07a540f..d359e62 100644
--- a/Interfaces/IXTagProvider.cs
+++ b/Interfaces/IXTagProvider.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.SignalR;
 using xDataService.Configuration;
@@ -54,10 +55,12 @@ namespace xTagService.Interfaces
         /// </summary>
         /// <param name="model"></param>
         /// <param name="connectionId"></param>
+        /// <param name="cancellationToken"></param>
         /// <returns></returns>
         Task<XTagDto> Add(
             XTagDto model,
-            string connectionId = null
+            string connectionId = null,
+            CancellationToken cancellationToken = default
         );
 
         /// <summary>
@@ -70,7 +73,8 @@ namespace xTagService.Interfaces
         Task<XTagDto> Update(
             int id,
             XTagDto model,
-            string connectionId = null
+            string connectionId = null,
+            CancellationToken cancellationToken = default
         );
 
         /// <summary>
@@ -81,7 +85,8 @@ namespace xTagService.Interfaces
         /// <returns></returns>
         Task<XTagDto> Remove(
             int id,
-            string connectionId = null
+            string connectionId = null,
+            CancellationToken cancellationToken = default
         );
 
         /// <summary>
@@ -89,51 +94,58 @@ namespace xTagService.Interfaces
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        Task<XTagDto> Get(int id);
+        Task<XTagDto> Get(
+            int id,
+            CancellationToken cancellationToken = default
+        );
 
         /// <summary>
         /// Retrieve Specified Tag by it's Label ...
         /// </summary>
         /// <param name="tag"></param>
         /// <returns></returns>
-        Task<XTagDto> GetTag(string tag);
+        Task<XTagDto> GetTag(
+            string tag,
+            CancellationToken cancellationToken = default
+        );
 
         /// <summary>
         /// Retrieve All Items as Dto ...
         /// </summary>
         /// <returns></returns>
-        Task<IEnumerable<XTagDto>> GetAll();
+        Task<IEnumerable<XTagDto>> GetAll(
+            CancellationToken cancellationToken = default
+        );
 
         /// <summary>
         /// Find Specified Item by Condition ... 
         /// </summary>
         /// <param name="whereClause"></param>
         /// <returns></returns>
-        Task<XTagDto> FindOne(Expression<Func<XTag, bool>> whereClause);
+        Task<XTagDto> FindOne(
+            Expression<Func<XTag, bool>> whereClause,
+            CancellationToken cancellationToken = default
+        );
 
         /// <summary>
         /// Find Many Items based on Conditions ...
         /// </summary>
         /// <param name="whereClause"></param>
         /// <returns></returns>
-        Task<IEnumerable<XTagDto>> FindMany(Expression<Func<XTag, bool>> whereClause);
+        Task<IEnumerable<XTagDto>> FindMany(
+            Expression<Func<XTag, bool>> whereClause,
+            CancellationToken cancellationToken = default
+        );
 
         /// <summary>
         /// Query Model retrieving Dtos ...
         /// </summary>
         /// <param name="query"></param>
         /// <returns></returns>
-        Task<XQueryResult<XTagDto>> Query(XQuery query);
-
-        /// <summary>
-        /// Query Conditional Retrieving Dtos ...
-        /// </summary>
-        /// <param name="query"></param>
-        /// <param name="whereClause"></param>
-        /// <returns></returns>
-        Task<XQueryResult<XTagDto>> ConditionalQuery(
+        Task<XQueryResult<XTagDto>> Query(
             XQuery query,
-            Expression<Func<XTag, bool>> whereClause
+            Expression<Func<XTag, bool>> whereClause = null,
+            CancellationToken cancellationToken = default
         );
 
         /// <summary>