diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.API/AIAHTML5.ADMIN.API.csproj b/400-SOURCECODE/AIAHTML5.ADMIN.API/AIAHTML5.ADMIN.API.csproj
index 3c38f38..8362acb 100644
--- a/400-SOURCECODE/AIAHTML5.ADMIN.API/AIAHTML5.ADMIN.API.csproj
+++ b/400-SOURCECODE/AIAHTML5.ADMIN.API/AIAHTML5.ADMIN.API.csproj
@@ -741,6 +741,9 @@
     <Compile Include="Entity\usp_GetLicenseUserGroups_Result.cs">
       <DependentUpon>AIADBEntity.tt</DependentUpon>
     </Compile>
+    <Compile Include="Entity\usp_GetLicenseUserGroupUsers_Result.cs">
+      <DependentUpon>AIADBEntity.tt</DependentUpon>
+    </Compile>
     <Compile Include="Entity\usp_GetManageRights_Result.cs">
       <DependentUpon>AIADBEntity.tt</DependentUpon>
     </Compile>
diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/usp_GetLicenseUserGroupUsers_Result.cs b/400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/usp_GetLicenseUserGroupUsers_Result.cs
new file mode 100644
index 0000000..f129818
--- /dev/null
+++ b/400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/usp_GetLicenseUserGroupUsers_Result.cs
@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//    This code was generated from a template.
+//
+//    Manual changes to this file may cause unexpected behavior in your application.
+//    Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace AIAHTML5.ADMIN.API.Entity
+{
+    using System;
+    
+    public partial class usp_GetLicenseUserGroupUsers_Result
+    {
+        public Nullable<long> RowNo { get; set; }
+        public int Id { get; set; }
+        public string FirstName { get; set; }
+        public string LastName { get; set; }
+        public string LoginId { get; set; }
+        public string EmailId { get; set; }
+        public string Title { get; set; }
+        public int InGroup { get; set; }
+    }
+}
diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.API/Models/UserGroupModel.cs b/400-SOURCECODE/AIAHTML5.ADMIN.API/Models/UserGroupModel.cs
index 634d6c6..0180efe 100644
--- a/400-SOURCECODE/AIAHTML5.ADMIN.API/Models/UserGroupModel.cs
+++ b/400-SOURCECODE/AIAHTML5.ADMIN.API/Models/UserGroupModel.cs
@@ -16,13 +16,15 @@ namespace AIAHTML5.ADMIN.API.Models
         public bool? IsActive { get; set; }
         public int? TotalUsers { get; set; }
 
-        public static List<UserGroupModel> GetLicenseUserGroups(AIADatabaseV5Entities dbContext, int LicenseId)
+        public static List<UserGroupModel> GetLicenseUserGroups(AIADatabaseV5Entities dbContext, int LicenseId, int pageNo, int pageLength, out int recordCount)
         {
             List<UserGroupModel> UserGroupList = new List<UserGroupModel>();
             UserGroupModel UserGroupObj = new UserGroupModel();
+            var spRecordCount = new System.Data.Objects.ObjectParameter("recordCount", 0);
+            recordCount = 0;
             try
             {
-                var result = dbContext.usp_GetLicenseUserGroups(LicenseId).ToList();
+                var result = dbContext.usp_GetLicenseUserGroups(LicenseId, pageNo, pageLength, spRecordCount).ToList();
                 foreach (var item in result)
                 {
                     UserGroupObj = new UserGroupModel();
@@ -35,18 +37,21 @@ namespace AIAHTML5.ADMIN.API.Models
                     UserGroupObj.TotalUsers = item.TotalUsers;
                     UserGroupList.Add(UserGroupObj);
                 }
+                recordCount = (int)spRecordCount.Value;
             }
             catch (Exception ex) { }
             return UserGroupList;
         }
 
-        public static List<UserModel> GetLicenseUserGroupUsers(AIADatabaseV5Entities dbContext, int LicenseId, int UserGroupId)
+        public static List<UserModel> GetLicenseUserGroupUsers(AIADatabaseV5Entities dbContext, int LicenseId, int UserGroupId, bool AllUsers, int pageNo, int pageLength, out int recordCount)
         {
             List<UserModel> UserList = new List<UserModel>();
             UserModel UserModelObj = new UserModel();
+            var spRecordCount = new System.Data.Objects.ObjectParameter("recordCount", 0);
+            recordCount = 0;
             try
             {
-                var result = dbContext.GetAllUserWithGroup(LicenseId, UserGroupId).ToList();
+                var result = dbContext.usp_GetLicenseUserGroupUsers(LicenseId, UserGroupId, AllUsers, pageNo, pageLength, spRecordCount).ToList();
                 foreach (var item in result)
                 {
                     UserModelObj = new UserModel();
@@ -59,6 +64,7 @@ namespace AIAHTML5.ADMIN.API.Models
                     UserModelObj.InGroup = item.InGroup;
                     UserList.Add(UserModelObj);
                 }
+                recordCount = (int)spRecordCount.Value;
             }
             catch (Exception ex) { }
             return UserList;
@@ -69,7 +75,7 @@ namespace AIAHTML5.ADMIN.API.Models
             var spStatus = new System.Data.Objects.ObjectParameter("Status", 0);
             try
             {
-                dbContext.usp_InsertUpdateLicenseUserGroup(UserGroupEntity.Id, UserGroupEntity.LicenseId, UserGroupEntity.Title, 
+                dbContext.usp_InsertUpdateLicenseUserGroup(UserGroupEntity.Id, UserGroupEntity.LicenseId, UserGroupEntity.Title,
                     UserGroupEntity.CreationDate, UserGroupEntity.ModifiedDate, UserGroupEntity.IsActive, spStatus);
                 return (bool)spStatus.Value;
             }