diff --git a/src/AzureIoTHub.Portal.Server.Tests/Controllers/ConcentratorsControllerTests.cs b/src/AzureIoTHub.Portal.Server.Tests/Controllers/ConcentratorsControllerTests.cs
index 94070ce05..30f51dd12 100644
--- a/src/AzureIoTHub.Portal.Server.Tests/Controllers/ConcentratorsControllerTests.cs
+++ b/src/AzureIoTHub.Portal.Server.Tests/Controllers/ConcentratorsControllerTests.cs
@@ -72,12 +72,12 @@ public async Task GetAllDeviceConcentrator_WithNoArgument_ReturnConcentratorList
             var concentratorController = this.CreateController();
 
             // Act
-            var result = await concentratorController.GetAllDeviceConcentrator();
+            var response = await concentratorController.GetAllDeviceConcentrator();
 
             // Assert
-            Assert.IsNotNull(result);
-            Assert.IsAssignableFrom<OkObjectResult>(result);
-            var okObjectResult = result as ObjectResult;
+            Assert.IsNotNull(response);
+            Assert.IsAssignableFrom<OkObjectResult>(response.Result);
+            var okObjectResult = response.Result as ObjectResult;
 
             Assert.IsNotNull(okObjectResult);
             Assert.AreEqual(200, okObjectResult.StatusCode);
@@ -114,12 +114,12 @@ public async Task GetDeviceConcentrator_With_Valid_Argument_Should_Return_Concen
             var concentratorController = this.CreateController();
 
             // Act
-            var result = await concentratorController.GetDeviceConcentrator(twin.DeviceId);
+            var response = await concentratorController.GetDeviceConcentrator(twin.DeviceId);
 
             // Assert
-            Assert.IsNotNull(result);
-            Assert.IsAssignableFrom<OkObjectResult>(result);
-            var okObjectResult = result as ObjectResult;
+            Assert.IsNotNull(response);
+            Assert.IsAssignableFrom<OkObjectResult>(response.Result);
+            var okObjectResult = response.Result as OkObjectResult;
 
             Assert.IsNotNull(okObjectResult);
             Assert.AreEqual(200, okObjectResult.StatusCode);
diff --git a/src/AzureIoTHub.Portal/Server/Controllers/v1.0/DeviceModelControllerBase.cs b/src/AzureIoTHub.Portal/Server/Controllers/v1.0/DeviceModelControllerBase.cs
index b5abc1331..63566f1c8 100644
--- a/src/AzureIoTHub.Portal/Server/Controllers/v1.0/DeviceModelControllerBase.cs
+++ b/src/AzureIoTHub.Portal/Server/Controllers/v1.0/DeviceModelControllerBase.cs
@@ -19,7 +19,7 @@ namespace AzureIoTHub.Portal.Server.Controllers.V10
     using Microsoft.Extensions.Logging;
 
     public abstract class DeviceModelsControllerBase<TListItemModel, TModel> : ControllerBase
-        where TModel: DeviceModel
+        where TModel : DeviceModel
         where TListItemModel : DeviceModel
     {
         /// <summary>
@@ -71,7 +71,7 @@ public DeviceModelsControllerBase(
             IDeviceModelImageManager deviceModelImageManager,
             IDeviceModelMapper<TListItemModel, TModel> deviceModelMapper,
             IDeviceService devicesService,
-            ITableClientFactory tableClientFactory, 
+            ITableClientFactory tableClientFactory,
             string filter)
         {
             this.log = log;
@@ -86,9 +86,7 @@ public DeviceModelsControllerBase(
         /// Gets the device models.
         /// </summary>
         /// <returns>The list of device models.</returns>
-        [HttpGet()]
-        [ProducesResponseType(StatusCodes.Status200OK)]
-        public ActionResult<IEnumerable<TListItemModel>> Get()
+        public virtual ActionResult<IEnumerable<TListItemModel>> Get()
         {
             // PartitionKey 0 contains all device models
             var entities = this.tableClientFactory
@@ -106,10 +104,7 @@ public ActionResult<IEnumerable<TListItemModel>> Get()
         /// </summary>
         /// <param name="id">The model identifier.</param>
         /// <returns>The corresponding model.</returns>
-        [HttpGet("{id}")]
-        [ProducesResponseType(StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
-        public ActionResult<TModel> Get(string id)
+        public virtual ActionResult<TModel> Get(string id)
         {
             try
             {
@@ -137,10 +132,7 @@ public ActionResult<TModel> Get(string id)
         /// </summary>
         /// <param name="id">The model identifier.</param>
         /// <returns>The avatar.</returns>
-        [HttpGet("{id}/avatar")]
-        [ProducesResponseType(StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
-        public ActionResult<string> GetAvatar(string id)
+        public virtual ActionResult<string> GetAvatar(string id)
         {
             try
             {
@@ -169,10 +161,7 @@ public ActionResult<string> GetAvatar(string id)
         /// <param name="id">The model identifier.</param>
         /// <param name="file">The file.</param>
         /// <returns>The avatar.</returns>
-        [HttpPost("{id}/avatar")]
-        [ProducesResponseType(StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
-        public async Task<ActionResult<string>> ChangeAvatar(string id, IFormFile file)
+        public virtual async Task<ActionResult<string>> ChangeAvatar(string id, IFormFile file)
         {
             try
             {
@@ -199,10 +188,7 @@ public async Task<ActionResult<string>> ChangeAvatar(string id, IFormFile file)
         /// Deletes the avatar.
         /// </summary>
         /// <param name="id">The model identifier.</param>
-        [HttpDelete("{id}/avatar")]
-        [ProducesResponseType(StatusCodes.Status204NoContent)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
-        public async Task<IActionResult> DeleteAvatar(string id)
+        public virtual async Task<IActionResult> DeleteAvatar(string id)
         {
             try
             {
@@ -232,10 +218,7 @@ public async Task<IActionResult> DeleteAvatar(string id)
         /// </summary>
         /// <param name="deviceModel">The device model.</param>
         /// <returns>The action result.</returns>
-        [HttpPost]
-        [ProducesResponseType(StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status400BadRequest)]
-        public async Task<IActionResult> Post(TModel deviceModel)
+        public virtual async Task<IActionResult> Post(TModel deviceModel)
         {
             if (!string.IsNullOrEmpty(deviceModel.ModelId))
             {
@@ -274,11 +257,7 @@ public async Task<IActionResult> Post(TModel deviceModel)
         /// </summary>
         /// <param name="deviceModel">The device model.</param>
         /// <returns>The action result.</returns>
-        [HttpPut("{id}")]
-        [ProducesResponseType(StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status400BadRequest)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
-        public async Task<IActionResult> Put(TModel deviceModel)
+        public virtual async Task<IActionResult> Put(TModel deviceModel)
         {
             if (string.IsNullOrEmpty(deviceModel.ModelId))
             {
@@ -315,11 +294,7 @@ public async Task<IActionResult> Put(TModel deviceModel)
         /// </summary>
         /// <param name="id">The device model identifier.</param>
         /// <returns>The action result.</returns>
-        [HttpDelete("{id}")]
-        [ProducesResponseType(StatusCodes.Status204NoContent)]
-        [ProducesResponseType(StatusCodes.Status400BadRequest)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
-        public async Task<IActionResult> Delete(string id)
+        public virtual async Task<IActionResult> Delete(string id)
         {
             // we get all devices
             var deviceList = await this.devicesService.GetAllDevice();
diff --git a/src/AzureIoTHub.Portal/Server/Controllers/v1.0/DeviceModelsController.cs b/src/AzureIoTHub.Portal/Server/Controllers/v1.0/DeviceModelsController.cs
index a10a06fbf..0910eb5b1 100644
--- a/src/AzureIoTHub.Portal/Server/Controllers/v1.0/DeviceModelsController.cs
+++ b/src/AzureIoTHub.Portal/Server/Controllers/v1.0/DeviceModelsController.cs
@@ -5,11 +5,13 @@ namespace AzureIoTHub.Portal.Server.Controllers.V10
 {
     using AzureIoTHub.Portal.Server.Factories;
     using AzureIoTHub.Portal.Server.Managers;
-    using AzureIoTHub.Portal.Server.Mappers;
     using AzureIoTHub.Portal.Server.Services;
     using AzureIoTHub.Portal.Shared.Models.V10.DeviceModel;
+    using Microsoft.AspNetCore.Http;
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.Extensions.Logging;
+    using System.Collections.Generic;
+    using System.Threading.Tasks;
 
     [ApiController]
     [ApiVersion("1.0")]
@@ -33,5 +35,109 @@ public DeviceModelsController(ILogger<DeviceModelsControllerBase<DeviceModel, De
             : base(log, deviceModelImageManager, deviceModelMapper, devicesService, tableClientFactory, $"")
         {
         }
+
+        /// <summary>
+        /// Gets the device model list.
+        /// </summary>
+        /// <returns>An array representing the device models.</returns>
+        [HttpGet(Name = "GET Device model list")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        public override ActionResult<IEnumerable<DeviceModel>> Get()
+        {
+            return base.Get();
+        }
+
+        /// <summary>
+        /// Get the device model details.
+        /// </summary>
+        /// <param name="id">The devic emodel identifier.</param>
+        /// <returns>The device model details.</returns>
+        [HttpGet("{id}", Name = "GET Device model")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public override ActionResult<DeviceModel> Get(string id)
+        {
+            return base.Get(id);
+        }
+
+        /// <summary>
+        /// Gets the device model avatar.
+        /// </summary>
+        /// <param name="id">The device model identifier</param>
+        /// <returns></returns>
+        [HttpGet("{id}/avatar", Name = "GET Device model avatar URL")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public override ActionResult<string> GetAvatar(string id)
+        {
+            return base.GetAvatar(id);
+        }
+
+        /// <summary>
+        /// Changes the avatar.
+        /// </summary>
+        /// <param name="id">The model identifier.</param>
+        /// <param name="file">The file.</param>
+        /// <returns>The avatar.</returns>
+        [HttpPost("{id}/avatar", Name = "POST Update the device model avatar")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public override Task<ActionResult<string>> ChangeAvatar(string id, IFormFile file)
+        {
+            return base.ChangeAvatar(id, file);
+        }
+
+        /// <summary>
+        /// Deletes the avatar.
+        /// </summary>
+        /// <param name="id">The model identifier.</param>
+        [HttpDelete("{id}/avatar", Name = "DELETE Remove the device model avatar")]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public override Task<IActionResult> DeleteAvatar(string id)
+        {
+            return base.DeleteAvatar(id);
+        }
+
+        /// <summary>
+        /// Creates the specified device model.
+        /// </summary>
+        /// <param name="deviceModel">The device model.</param>
+        /// <returns>The action result.</returns>
+        [HttpPost(Name = "POST Create a new device model")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        public override Task<IActionResult> Post(DeviceModel deviceModel)
+        {
+            return base.Post(deviceModel);
+        }
+
+        /// <summary>
+        /// Updates the specified device model.
+        /// </summary>
+        /// <param name="deviceModel">The device model.</param>
+        /// <returns>The action result.</returns>
+        [HttpPut("{id}", Name = "PUT Update the device model")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public override Task<IActionResult> Put(DeviceModel deviceModel)
+        {
+            return base.Put(deviceModel);
+        }
+
+        /// <summary>
+        /// Deletes the specified device model.
+        /// </summary>
+        /// <param name="id">The device model identifier.</param>
+        /// <returns>The action result.</returns>
+        [HttpDelete("{id}", Name = "DELETE Remove the device model")]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public override Task<IActionResult> Delete(string id)
+        {
+            return base.Delete(id);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/AzureIoTHub.Portal/Server/Controllers/v1.0/DevicesController.cs b/src/AzureIoTHub.Portal/Server/Controllers/v1.0/DevicesController.cs
index 7f61af7c5..f3813e10d 100644
--- a/src/AzureIoTHub.Portal/Server/Controllers/v1.0/DevicesController.cs
+++ b/src/AzureIoTHub.Portal/Server/Controllers/v1.0/DevicesController.cs
@@ -8,6 +8,8 @@ namespace AzureIoTHub.Portal.Server.Controllers.V10
     using AzureIoTHub.Portal.Shared.Models.V10.Device;
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.Extensions.Logging;
+    using System.Collections.Generic;
+    using System.Threading.Tasks;
 
     [ApiController]
     [ApiVersion("1.0")]
@@ -23,5 +25,59 @@ public DevicesController(
         {
 
         }
+
+        /// <summary>
+        /// Gets the device list.
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet(Name = "GET Device list")]
+        public override Task<IEnumerable<DeviceListItem>> Get()
+        {
+            return base.Get();
+        }
+
+        /// <summary>
+        /// Gets the specified device.
+        /// </summary>
+        /// <param name="deviceID">The device identifier.</param>
+        /// <returns></returns>
+        [HttpGet("{deviceID}", Name = "GET Device details")]
+        public override Task<DeviceDetails> Get(string deviceID)
+        {
+            return base.Get(deviceID);
+        }
+
+        /// <summary>
+        /// Creates the device.
+        /// </summary>
+        /// <param name="device">The device.</param>
+        /// <returns></returns>
+        [HttpPost(Name = "POST Create device")]
+        public override Task<IActionResult> CreateDeviceAsync(DeviceDetails device)
+        {
+            return base.CreateDeviceAsync(device);
+        }
+
+        /// <summary>
+        /// Updates the device.
+        /// </summary>
+        /// <param name="device">The device.</param>
+        /// <returns></returns>
+        [HttpPut(Name = "PUT Update device")]
+        public override Task<IActionResult> UpdateDeviceAsync(DeviceDetails device)
+        {
+            return base.UpdateDeviceAsync(device);
+        }
+
+        /// <summary>
+        /// Deletes the specified device.
+        /// </summary>
+        /// <param name="deviceID">The device identifier.</param>
+        /// <returns></returns>
+        [HttpDelete("{deviceID}", Name = "DELETE Remove device")]
+        public override Task<IActionResult> Delete(string deviceID)
+        {
+            return base.Delete(deviceID);
+        }
     }
 }
diff --git a/src/AzureIoTHub.Portal/Server/Controllers/v1.0/DevicesControllerBase.cs b/src/AzureIoTHub.Portal/Server/Controllers/v1.0/DevicesControllerBase.cs
index 9db5b4662..0eb4d7012 100644
--- a/src/AzureIoTHub.Portal/Server/Controllers/v1.0/DevicesControllerBase.cs
+++ b/src/AzureIoTHub.Portal/Server/Controllers/v1.0/DevicesControllerBase.cs
@@ -6,15 +6,10 @@ namespace AzureIoTHub.Portal.Server.Controllers.V10
     using System;
     using System.Collections.Generic;
     using System.Linq;
-    using System.Net.Http.Json;
     using System.Threading.Tasks;
-    using Azure.Data.Tables;
-    using AzureIoTHub.Portal.Server.Factories;
-    using AzureIoTHub.Portal.Server.Managers;
     using AzureIoTHub.Portal.Server.Mappers;
     using AzureIoTHub.Portal.Server.Services;
     using AzureIoTHub.Portal.Shared.Models.V10.Device;
-    using Microsoft.AspNetCore.Http;
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.Azure.Devices;
     using Microsoft.Azure.Devices.Common.Exceptions;
@@ -40,12 +35,10 @@ public DevicesControllerBase(
         }
 
         /// <summary>
-        /// Gets a list of devices as DeviceListItem from Azure IoT Hub.
-        /// Fields that do not appear in the device list are not defined here.
+        /// Gets the device list.
         /// </summary>
-        /// <returns>A list of DeviceListItem.</returns>
-        [HttpGet]
-        public async Task<IEnumerable<TListItem>> Get()
+        /// <returns></returns>
+        public virtual async Task<IEnumerable<TListItem>> Get()
         {
             var items = await this.devicesService.GetAllDevice(excludeDeviceType: "LoRa Concentrator");
 
@@ -53,21 +46,23 @@ public async Task<IEnumerable<TListItem>> Get()
         }
 
         /// <summary>
-        /// Retrieve a specific device and from the IoT Hub.
-        /// Converts it to a DeviceListItem.
+        /// Gets the specified device.
         /// </summary>
-        /// <param name="deviceID">ID of the device to retrieve.</param>
-        /// <returns>The DeviceListItem corresponding to the given ID.</returns>
-        [HttpGet("{deviceID}")]
-        public async Task<TModel> Get(string deviceID)
+        /// <param name="deviceID">The device identifier.</param>
+        /// <returns></returns>
+        public virtual async Task<TModel> Get(string deviceID)
         {
             var item = await this.devicesService.GetDeviceTwin(deviceID);
 
             return this.deviceTwinMapper.CreateDeviceDetails(item);
         }
 
-        [HttpPost]
-        public async Task<IActionResult> CreateDeviceAsync(TModel device)
+        /// <summary>
+        /// Creates the device.
+        /// </summary>
+        /// <param name="device">The device.</param>
+        /// <returns></returns>
+        public virtual async Task<IActionResult> CreateDeviceAsync(TModel device)
         {
             try
             {
@@ -103,12 +98,11 @@ public async Task<IActionResult> CreateDeviceAsync(TModel device)
         }
 
         /// <summary>
-        /// this function update the twin and the device.
+        /// Updates the device.
         /// </summary>
-        /// <param name="device">the device object.</param>
-        /// <returns>the update twin.</returns>
-        [HttpPut]
-        public async Task<IActionResult> UpdateDeviceAsync(TModel device)
+        /// <param name="device">The device.</param>
+        /// <returns></returns>
+        public virtual async Task<IActionResult> UpdateDeviceAsync(TModel device)
         {
             if (!this.ModelState.IsValid)
             {
@@ -132,13 +126,13 @@ public async Task<IActionResult> UpdateDeviceAsync(TModel device)
             return this.Ok();
         }
 
+
         /// <summary>
-        /// this function delete a device.
+        /// Deletes the specified device.
         /// </summary>
-        /// <param name="deviceID">the device id.</param>
-        /// <returns>ok status on success.</returns>
-        [HttpDelete("{deviceID}")]
-        public async Task<IActionResult> Delete(string deviceID)
+        /// <param name="deviceID">The device identifier.</param>
+        /// <returns></returns>
+        public virtual async Task<IActionResult> Delete(string deviceID)
         {
             await this.devicesService.DeleteDevice(deviceID);
             return this.Ok();
diff --git a/src/AzureIoTHub.Portal/Server/Controllers/v1.0/EdgeConfigurationsController.cs b/src/AzureIoTHub.Portal/Server/Controllers/v1.0/EdgeConfigurationsController.cs
index 58dff21eb..aeb8841cc 100644
--- a/src/AzureIoTHub.Portal/Server/Controllers/v1.0/EdgeConfigurationsController.cs
+++ b/src/AzureIoTHub.Portal/Server/Controllers/v1.0/EdgeConfigurationsController.cs
@@ -10,6 +10,7 @@ namespace AzureIoTHub.Portal.Server.Controllers.V10
     using AzureIoTHub.Portal.Server.Helpers;
     using AzureIoTHub.Portal.Server.Services;
     using AzureIoTHub.Portal.Shared.Models.V10;
+    using Microsoft.AspNetCore.Http;
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.Azure.Devices;
     using Newtonsoft.Json.Linq;
@@ -28,10 +29,11 @@ public EdgeConfigurationsController(ConfigsServices configService)
         }
 
         /// <summary>
-        /// Gets a list of deployments as ConfigListItem from Azure IoT Hub.
+        /// Gets the IoT Edge deployment configurations.
         /// </summary>
-        /// <returns>A list of ConfigListItem.</returns>
-        [HttpGet]
+        /// <returns></returns>
+        [HttpGet(Name = "GET IoT Edge config list")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
         public async Task<IEnumerable<ConfigListItem>> Get()
         {
             // Retrieve every Configurations, regardless of the parameter given... Why?
@@ -62,12 +64,12 @@ public async Task<IEnumerable<ConfigListItem>> Get()
         }
 
         /// <summary>
-        /// Retrieve a specific deployment and its modules from the IoT Hub.
-        /// Converts it to a ConfigListItem.
+        /// Gets the specified configuration.
         /// </summary>
-        /// <param name="configurationID">ID of the deployment to retrieve.</param>
-        /// <returns>The ConfigListItem corresponding to the given ID.</returns>
-        [HttpGet("{configurationID}")]
+        /// <param name="configurationID">The configuration identifier.</param>
+        /// <returns></returns>
+        /// <exception cref="System.InvalidOperationException">Could not parse properties.desired.</exception>
+        [HttpGet("{configurationID}", Name ="GET IoT Edge configuration")]
         public async Task<ConfigListItem> Get(string configurationID)
         {
             var config = await this.configService.GetConfigItem(configurationID);
diff --git a/src/AzureIoTHub.Portal/Server/Controllers/v1.0/EdgeDevicesController.cs b/src/AzureIoTHub.Portal/Server/Controllers/v1.0/EdgeDevicesController.cs
index 20e26cff8..130ef4c49 100644
--- a/src/AzureIoTHub.Portal/Server/Controllers/v1.0/EdgeDevicesController.cs
+++ b/src/AzureIoTHub.Portal/Server/Controllers/v1.0/EdgeDevicesController.cs
@@ -27,13 +27,39 @@ namespace AzureIoTHub.Portal.Server.Controllers.V10
     [ApiExplorerSettings(GroupName = "IoT Edge")]
     public class EdgeDevicesController : ControllerBase
     {
+        /// <summary>
+        /// The device  edge devices controller.
+        /// </summary>
         private readonly ILogger<EdgeDevicesController> logger;
 
+        /// <summary>
+        /// The device registry manager.
+        /// </summary>
         private readonly RegistryManager registryManager;
+
+        /// <summary>
+        /// The device iconfiguration.
+        /// </summary>
         private readonly IConfiguration configuration;
+
+        /// <summary>
+        /// The device idevice service.
+        /// </summary>
         private readonly IDeviceService devicesService;
+
+        /// <summary>
+        /// The device iconnection string manager.
+        /// </summary>
         private readonly IConnectionStringManager connectionStringManager;
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EdgeDevicesController"/> class.
+        /// </summary>
+        /// <param name="logger">The logger.</param>
+        /// <param name="configuration">The configuration.</param>
+        /// <param name="registryManager">The registry manager.</param>
+        /// <param name="connectionStringManager">The connection string manager.</param>
+        /// <param name="service">The service.</param>
         public EdgeDevicesController(
             IConfiguration configuration,
             ILogger<EdgeDevicesController> logger,
@@ -49,19 +75,17 @@ public EdgeDevicesController(
         }
 
         /// <summary>
-        /// Fonction permettant de récupèrer la liste des appareils Edge .
-        /// Après avoir éxecuté la query du registryManager on récupère le resultat
-        /// sous la forme d'une liste de Twin.
+        /// Gets the IoT Edge device list.
         /// </summary>
-        /// <returns>List of GatewayListItem.</returns>
-        [HttpGet]
+        /// <returns></returns>
+        [HttpGet(Name = "GET IoT Edge devices")]
         [ProducesResponseType(StatusCodes.Status200OK, Type = typeof(List<GatewayListItem>))]
         public async Task<IActionResult> Get()
         {
             // don't contain tags
             IEnumerable<Twin> edgeDevices = await this.devicesService.GetAllEdgeDevice();
 
-            List<GatewayListItem> newGatewayList = new ();
+            List<GatewayListItem> newGatewayList = new();
 
             foreach (Twin deviceTwin in edgeDevices)
             {
@@ -69,7 +93,7 @@ public async Task<IActionResult> Get()
 
                 if (twin != null)
                 {
-                    GatewayListItem gateway = new ()
+                    GatewayListItem gateway = new()
                     {
                         DeviceId = deviceTwin.DeviceId,
                         Status = twin.Status?.ToString(),
@@ -85,12 +109,11 @@ public async Task<IActionResult> Get()
         }
 
         /// <summary>
-        /// This function return all the information we want of
-        /// a device.
+        /// Gets the specified device.
         /// </summary>
-        /// <param name="deviceId">the device id.</param>
-        /// <returns>Gateway.</returns>
-        [HttpGet("{deviceId}")]
+        /// <param name="deviceId">The device identifier.</param>
+        /// <returns></returns>
+        [HttpGet("{deviceId}", Name = "GET IoT Edge device")]
         [ProducesResponseType(StatusCodes.Status200OK, Type = typeof(Gateway))]
         public async Task<IActionResult> Get(string deviceId)
         {
@@ -99,7 +122,7 @@ public async Task<IActionResult> Get(string deviceId)
                 Twin deviceTwin = await this.devicesService.GetDeviceTwin(deviceId);
                 Twin deviceWithModules = await this.devicesService.GetDeviceTwinWithModule(deviceId);
 
-                Gateway gateway = new ()
+                Gateway gateway = new()
                 {
                     DeviceId = deviceTwin.DeviceId,
                     Status = deviceTwin.Status?.ToString(),
@@ -127,23 +150,32 @@ public async Task<IActionResult> Get(string deviceId)
             }
         }
 
-        [HttpGet("{deviceId}/{deviceType}/ConnectionString")]
+        /// <summary>
+        /// Gets the IoT Edge device symmetric key.
+        /// </summary>
+        /// <param name="deviceId">The device identifier.</param>
+        /// <param name="deviceType">Type of the device.</param>
+        /// <returns></returns>
+        [HttpGet("{deviceId}/{deviceType}/ConnectionString", Name = "GET Device symmetric key")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
         public async Task<IActionResult> GetSymmetricKey(string deviceId, string deviceType)
         {
             return this.Ok(await this.connectionStringManager.GetSymmetricKey(deviceId, deviceType));
         }
 
         /// <summary>
-        /// this function create a device with the twin information.
+        /// Creates the IoT Edge device.
         /// </summary>
-        /// <param name="gateway">the gateway object.</param>
-        /// <returns>Bulk registry operation result.</returns>
-        [HttpPost]
+        /// <param name="gateway">The IoT Edge device.</param>
+        /// <returns></returns>
+        [HttpPost(Name = "POST Gateway")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
         public async Task<IActionResult> CreateGatewayAsync(Gateway gateway)
         {
             try
             {
-                Twin deviceTwin = new (gateway.DeviceId);
+                Twin deviceTwin = new(gateway.DeviceId);
 
                 deviceTwin.Tags["env"] = gateway.Environment;
                 deviceTwin.Tags["purpose"] = gateway.Type;
@@ -161,11 +193,12 @@ public async Task<IActionResult> CreateGatewayAsync(Gateway gateway)
         }
 
         /// <summary>
-        /// This function update the properties of a device.
+        /// Updates the device.
         /// </summary>
-        /// <param name="gateway">a gateways object.</param>
-        /// <returns>the twin of the device.</returns>
-        [HttpPut("{gateway}")]
+        /// <param name="gateway">The IoT Edge device.</param>
+        /// <returns></returns>
+        [HttpPut(Name = "PUT")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
         public async Task<IActionResult> UpdateDeviceAsync(Gateway gateway)
         {
             Device device = await this.devicesService.GetDevice(gateway.DeviceId);
@@ -186,11 +219,12 @@ public async Task<IActionResult> UpdateDeviceAsync(Gateway gateway)
         }
 
         /// <summary>
-        /// this function delete a device.
+        /// Deletes the device.
         /// </summary>
-        /// <param name="deviceId">the device id to delete.</param>
-        /// <returns>message.</returns>
-        [HttpDelete("{deviceId}")]
+        /// <param name="deviceId">The device identifier.</param>
+        /// <returns></returns>
+        [HttpDelete(Name = "{deviceId}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
         public async Task<IActionResult> DeleteDeviceAsync(string deviceId)
         {
             await this.devicesService.DeleteDevice(deviceId);
@@ -199,10 +233,17 @@ public async Task<IActionResult> DeleteDeviceAsync(string deviceId)
             return this.Ok($"iot hub device was delete  {deviceId}");
         }
 
-        [HttpPost("{deviceId}/{moduleId}/{methodName}")]
+        /// <summary>
+        /// Executes the module method on the IoT Edge device.
+        /// </summary>
+        /// <param name="module">The module.</param>
+        /// <param name="deviceId">The device identifier.</param>
+        /// <param name="methodName">Name of the method.</param>
+        /// <returns></returns>
+        [HttpPost("{deviceId}/{moduleId}/{methodName}", Name = "POST Execute module command")]
         public async Task<C2Dresult> ExecuteMethode(GatewayModule module, string deviceId, string methodName)
         {
-            CloudToDeviceMethod method = new (methodName);
+            CloudToDeviceMethod method = new(methodName);
             string payload = string.Empty;
 
             if (methodName == "RestartModule")
@@ -248,11 +289,10 @@ public async Task<C2Dresult> ExecuteMethode(GatewayModule module, string deviceI
         }
 
         /// <summary>
-        /// this function get and return the number of device connected
-        /// to a gateway.
+        /// Retrieves the connected devices number on the IoT Edge.
         /// </summary>
-        /// <param name="deviceId">id of the device.</param>
-        /// <returns>int.</returns>
+        /// <param name="deviceId">The device identifier.</param>
+        /// <returns></returns>
         private async Task<int> RetrieveNbConnectedDevice(string deviceId)
         {
             IQuery query = this.registryManager.CreateQuery($"SELECT * FROM devices.modules WHERE devices.modules.moduleId = '$edgeHub' AND deviceId in ['{deviceId}']", 1);
@@ -268,13 +308,13 @@ private async Task<int> RetrieveNbConnectedDevice(string deviceId)
         }
 
         /// <summary>
-        /// This function found the last conguration deployed on the device.
+        /// Retrieves the last configuration of the IoT Edge.
         /// </summary>
-        /// <param name="twin">the twin of the device we want.</param>
-        /// <returns>ConfigItem.</returns>
+        /// <param name="twin">The twin.</param>
+        /// <returns></returns>
         private async Task<ConfigItem> RetrieveLastConfiguration(Twin twin)
         {
-            ConfigItem item = new ();
+            ConfigItem item = new();
 
             if (twin.Configurations != null && twin.Configurations.Count > 0)
             {
diff --git a/src/AzureIoTHub.Portal/Server/Controllers/v1.0/LoRaWAN/LoRaWANCommandsController.cs b/src/AzureIoTHub.Portal/Server/Controllers/v1.0/LoRaWAN/LoRaWANCommandsController.cs
index d0f7f4ba6..dd0b0446b 100644
--- a/src/AzureIoTHub.Portal/Server/Controllers/v1.0/LoRaWAN/LoRaWANCommandsController.cs
+++ b/src/AzureIoTHub.Portal/Server/Controllers/v1.0/LoRaWAN/LoRaWANCommandsController.cs
@@ -53,12 +53,12 @@ public LoRaWANCommandsController(
         }
 
         /// <summary>
-        /// Sets the device model's commands.
+        /// Updates the device model's commands.
         /// </summary>
         /// <param name="id">The model identifier.</param>
         /// <param name="commands">The commands.</param>
         /// <returns>The action result.</returns>
-        [HttpPost(Name = "POST Device model commands")]
+        [HttpPost(Name = "POST Set device model commands")]
         [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status404NotFound)]
         public async Task<IActionResult> Post(string id, DeviceModelCommand[] commands)
@@ -115,7 +115,7 @@ await this.tableClientFactory
         }
 
         /// <summary>
-        /// Sets the device model's commands.
+        /// Gets the device model's commands.
         /// </summary>
         /// <param name="id">The model identifier.</param>
         /// <returns>The action result.</returns>
diff --git a/src/AzureIoTHub.Portal/Server/Controllers/v1.0/LoRaWAN/LoRaWANConcentratorsController.cs b/src/AzureIoTHub.Portal/Server/Controllers/v1.0/LoRaWAN/LoRaWANConcentratorsController.cs
index f76d8a538..0234d5bf2 100644
--- a/src/AzureIoTHub.Portal/Server/Controllers/v1.0/LoRaWAN/LoRaWANConcentratorsController.cs
+++ b/src/AzureIoTHub.Portal/Server/Controllers/v1.0/LoRaWAN/LoRaWANConcentratorsController.cs
@@ -11,6 +11,7 @@ namespace AzureIoTHub.Portal.Server.Controllers.V10.LoRaWAN
     using AzureIoTHub.Portal.Server.Mappers;
     using AzureIoTHub.Portal.Server.Services;
     using AzureIoTHub.Portal.Shared.Models.V10.LoRaWAN.Concentrator;
+    using Microsoft.AspNetCore.Http;
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.Azure.Devices;
     using Microsoft.Azure.Devices.Common.Exceptions;
@@ -23,11 +24,33 @@ namespace AzureIoTHub.Portal.Server.Controllers.V10.LoRaWAN
     [ApiExplorerSettings(GroupName = "LoRa WAN")]
     public class LoRaWANConcentratorsController : ControllerBase
     {
+        /// <summary>
+        /// The device Idevice service.
+        /// </summary>
         private readonly IDeviceService devicesService;
+
+        /// <summary>
+        /// The device IConcentrator twin mapper.
+        /// </summary>
         private readonly IConcentratorTwinMapper concentratorTwinMapper;
+
+        /// <summary>
+        /// The device IRouter config manager.
+        /// </summary>
         private readonly IRouterConfigManager routerConfigManager;
+
+        /// <summary>
+        /// The device Lora wan concentrators controller.
+        /// </summary>
         private readonly ILogger<LoRaWANConcentratorsController> logger;
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LoRaWANConcentratorsController"/> class.
+        /// </summary>
+        /// <param name="logger">The logger.</param>
+        /// <param name="devicesService">The devices service.</param>
+        /// <param name="routerConfigManager">The router config manager.</param>
+        /// <param name="concentratorTwinMapper">The concentrator twin mapper.</param>
         public LoRaWANConcentratorsController(
             ILogger<LoRaWANConcentratorsController> logger,
             IDeviceService devicesService,
@@ -40,8 +63,13 @@ public LoRaWANConcentratorsController(
             this.routerConfigManager = routerConfigManager;
         }
 
-        [HttpGet]
-        public async Task<IActionResult> GetAllDeviceConcentrator()
+        /// <summary>
+        /// Gets all device concentrators.
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet(Name = "GET LoRaWAN Concentrator list")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        public async Task<ActionResult<IEnumerable<Concentrator>>> GetAllDeviceConcentrator()
         {
             // Gets all the twins from this devices
             var items = await this.devicesService.GetAllDevice(filterDeviceType: "LoRa Concentrator");
@@ -51,14 +79,27 @@ public async Task<IActionResult> GetAllDeviceConcentrator()
             return this.Ok(result);
         }
 
-        [HttpGet("{deviceId}")]
-        public async Task<IActionResult> GetDeviceConcentrator(string deviceId)
+        /// <summary>
+        /// Gets the device concentrator.
+        /// </summary>
+        /// <param name="deviceId">The device identifier.</param>
+        /// <returns></returns>
+        [HttpGet("{deviceId}", Name = "GET LoRaWAN Concentrator")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        public async Task<ActionResult<Concentrator>> GetDeviceConcentrator(string deviceId)
         {
             var item = await this.devicesService.GetDeviceTwin(deviceId);
             return this.Ok(this.concentratorTwinMapper.CreateDeviceDetails(item));
         }
 
-        [HttpPost]
+        /// <summary>
+        /// Creates the device.
+        /// </summary>
+        /// <param name="device">The device.</param>
+        /// <returns></returns>
+        [HttpPost(Name = "POST Create LoRaWAN concentrator")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
         public async Task<IActionResult> CreateDeviceAsync(Concentrator device)
         {
             try
@@ -96,7 +137,14 @@ public async Task<IActionResult> CreateDeviceAsync(Concentrator device)
             }
         }
 
-        [HttpPut]
+        /// <summary>
+        /// Updates the device.
+        /// </summary>
+        /// <param name="device">The device.</param>
+        /// <returns></returns>
+        [HttpPut(Name = "PUT Update LoRaWAN concentrator")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
         public async Task<IActionResult> UpdateDeviceAsync(Concentrator device)
         {
             if (!this.ModelState.IsValid)
@@ -123,11 +171,12 @@ public async Task<IActionResult> UpdateDeviceAsync(Concentrator device)
         }
 
         /// <summary>
-        /// this function delete a device.
+        /// Deletes the specified device.
         /// </summary>
-        /// <param name="deviceId">the device id.</param>
-        /// <returns>ok status on success.</returns>
-        [HttpDelete("{deviceId}")]
+        /// <param name="deviceId">The device identifier.</param>
+        /// <returns></returns>
+        [HttpDelete("{deviceId}", Name = "DELETE Remove LoRaWAN concentrator")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
         public async Task<IActionResult> Delete(string deviceId)
         {
             await this.devicesService.DeleteDevice(deviceId);
diff --git a/src/AzureIoTHub.Portal/Server/Controllers/v1.0/LoRaWAN/LoRaWANDeviceModelsController.cs b/src/AzureIoTHub.Portal/Server/Controllers/v1.0/LoRaWAN/LoRaWANDeviceModelsController.cs
index eff5c712f..bd4f293fc 100644
--- a/src/AzureIoTHub.Portal/Server/Controllers/v1.0/LoRaWAN/LoRaWANDeviceModelsController.cs
+++ b/src/AzureIoTHub.Portal/Server/Controllers/v1.0/LoRaWAN/LoRaWANDeviceModelsController.cs
@@ -5,12 +5,14 @@ namespace AzureIoTHub.Portal.Server.Controllers.V10.LoRaWAN
 {
     using AzureIoTHub.Portal.Server.Factories;
     using AzureIoTHub.Portal.Server.Managers;
-    using AzureIoTHub.Portal.Server.Mappers;
     using AzureIoTHub.Portal.Server.Services;
     using AzureIoTHub.Portal.Shared.Models.V10.DeviceModel;
     using AzureIoTHub.Portal.Shared.Models.V10.LoRaWAN.LoRaDeviceModel;
+    using Microsoft.AspNetCore.Http;
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.Extensions.Logging;
+    using System.Collections.Generic;
+    using System.Threading.Tasks;
 
     [ApiController]
     [ApiVersion("1.0")]
@@ -36,5 +38,109 @@ public LoRaWANDeviceModelsController(
                   $"{nameof(DeviceModel.SupportLoRaFeatures)} eq true")
         {
         }
+
+        /// <summary>
+        /// Gets the device model list.
+        /// </summary>
+        /// <returns>An array representing the device models.</returns>
+        [HttpGet(Name = "GET LoRaWAN device model list")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        public override ActionResult<IEnumerable<DeviceModel>> Get()
+        {
+            return base.Get();
+        }
+
+        /// <summary>
+        /// Get the device model details.
+        /// </summary>
+        /// <param name="id">The devic emodel identifier.</param>
+        /// <returns>The device model details.</returns>
+        [HttpGet("{id}", Name = "GET LoRaWAN device model")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public override ActionResult<LoRaDeviceModel> Get(string id)
+        {
+            return base.Get(id);
+        }
+
+        /// <summary>
+        /// Gets the device model avatar.
+        /// </summary>
+        /// <param name="id">The device model identifier</param>
+        /// <returns></returns>
+        [HttpGet("{id}/avatar", Name = "GET LoRaWAN device model avatar URL")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public override ActionResult<string> GetAvatar(string id)
+        {
+            return base.GetAvatar(id);
+        }
+
+        /// <summary>
+        /// Changes the avatar.
+        /// </summary>
+        /// <param name="id">The model identifier.</param>
+        /// <param name="file">The file.</param>
+        /// <returns>The avatar.</returns>
+        [HttpPost("{id}/avatar", Name = "POST Update the LoRaWAN device model avatar")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public override Task<ActionResult<string>> ChangeAvatar(string id, IFormFile file)
+        {
+            return base.ChangeAvatar(id, file);
+        }
+
+        /// <summary>
+        /// Deletes the avatar.
+        /// </summary>
+        /// <param name="id">The model identifier.</param>
+        [HttpDelete("{id}/avatar", Name = "DELETE Remove the LoRaWAN device model avatar")]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public override Task<IActionResult> DeleteAvatar(string id)
+        {
+            return base.DeleteAvatar(id);
+        }
+
+        /// <summary>
+        /// Creates the specified device model.
+        /// </summary>
+        /// <param name="deviceModel">The device model.</param>
+        /// <returns>The action result.</returns>
+        [HttpPost(Name = "POST Create a new LoRaWAN device model")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        public override Task<IActionResult> Post(LoRaDeviceModel deviceModel)
+        {
+            return base.Post(deviceModel);
+        }
+
+        /// <summary>
+        /// Updates the specified device model.
+        /// </summary>
+        /// <param name="deviceModel">The device model.</param>
+        /// <returns>The action result.</returns>
+        [HttpPut("{id}", Name = "PUT Update the LoRaWAN device model")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public override Task<IActionResult> Put(LoRaDeviceModel deviceModel)
+        {
+            return base.Put(deviceModel);
+        }
+
+        /// <summary>
+        /// Deletes the specified device model.
+        /// </summary>
+        /// <param name="id">The device model identifier.</param>
+        /// <returns>The action result.</returns>
+        [HttpDelete("{id}", Name = "DELETE Remove the LoRaWAN device model")]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public override Task<IActionResult> Delete(string id)
+        {
+            return base.Delete(id);
+        }
     }
 }
diff --git a/src/AzureIoTHub.Portal/Server/Controllers/v1.0/LoRaWAN/LoRaWANDevicesController.cs b/src/AzureIoTHub.Portal/Server/Controllers/v1.0/LoRaWAN/LoRaWANDevicesController.cs
index a071618ec..14273cd4c 100644
--- a/src/AzureIoTHub.Portal/Server/Controllers/v1.0/LoRaWAN/LoRaWANDevicesController.cs
+++ b/src/AzureIoTHub.Portal/Server/Controllers/v1.0/LoRaWAN/LoRaWANDevicesController.cs
@@ -13,9 +13,9 @@ namespace AzureIoTHub.Portal.Server.Controllers.V10
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.Extensions.Logging;
     using System;
+    using System.Collections.Generic;
     using System.Linq;
     using System.Net;
-    using System.Net.Http.Json;
     using System.Threading.Tasks;
 
     [ApiController]
@@ -43,12 +43,67 @@ public LoRaWANDevicesController(
         }
 
         /// <summary>
-        /// Permit to execute cloud to device message.
+        /// Gets the device list.
         /// </summary>
-        /// <param name="deviceId">id of the device.</param>
-        /// <param name="commandId">the command who contain the name and the trame.</param>
-        /// <returns>a CloudToDeviceMethodResult .</returns>
-        [HttpPost("{deviceId}/_command/{commandId}")]
+        /// <returns></returns>
+        [HttpGet(Name = "GET LoRaWAN device list")]
+        public override Task<IEnumerable<DeviceListItem>> Get()
+        {
+            return base.Get();
+        }
+
+        /// <summary>
+        /// Gets the specified device.
+        /// </summary>
+        /// <param name="deviceID">The device identifier.</param>
+        /// <returns></returns>
+        [HttpGet("{deviceID}", Name = "GET LoRaWAN device details")]
+        public override Task<LoRaDeviceDetails> Get(string deviceID)
+        {
+            return base.Get(deviceID);
+        }
+
+        /// <summary>
+        /// Creates the device.
+        /// </summary>
+        /// <param name="device">The device.</param>
+        /// <returns></returns>
+        [HttpPost(Name = "POST Create LoRaWAN device")]
+        public override Task<IActionResult> CreateDeviceAsync(LoRaDeviceDetails device)
+        {
+            return base.CreateDeviceAsync(device);
+        }
+
+        /// <summary>
+        /// Updates the device.
+        /// </summary>
+        /// <param name="device">The device.</param>
+        /// <returns></returns>
+        [HttpPut(Name = "PUT Update LoRaWAN device")]
+        public override Task<IActionResult> UpdateDeviceAsync(LoRaDeviceDetails device)
+        {
+            return base.UpdateDeviceAsync(device);
+        }
+
+        /// <summary>
+        /// Deletes the specified device.
+        /// </summary>
+        /// <param name="deviceID">The device identifier.</param>
+        /// <returns></returns>
+        [HttpDelete("{deviceID}", Name = "DELETE Remove LoRaWAN device")]
+        public override Task<IActionResult> Delete(string deviceID)
+        {
+            return base.Delete(deviceID);
+        }
+
+        /// <summary>
+        /// Executes the command on the device..
+        /// </summary>
+        /// <param name="deviceId">The device identifier.</param>
+        /// <param name="commandId">The command identifier.</param>
+        /// <returns></returns>
+        /// <exception cref="System.FormatException">Incorrect port or invalid DevEui Format.</exception>
+        [HttpPost("{deviceId}/_command/{commandId}", Name ="POST Execute LoRaWAN command")]
         public async Task<IActionResult> ExecuteCommand(string deviceId, string commandId)
         {
             try
diff --git a/src/AzureIoTHub.Portal/Server/Controllers/v1.0/SettingsController.cs b/src/AzureIoTHub.Portal/Server/Controllers/v1.0/SettingsController.cs
index 7231cd1e0..ac2541fe6 100644
--- a/src/AzureIoTHub.Portal/Server/Controllers/v1.0/SettingsController.cs
+++ b/src/AzureIoTHub.Portal/Server/Controllers/v1.0/SettingsController.cs
@@ -17,8 +17,15 @@ namespace AzureIoTHub.Portal.Server.Controllers.V10
     [ApiExplorerSettings(GroupName = "Portal Settings")]
     public class SettingsController : ControllerBase
     {
+        /// <summary>
+        /// The device client api indentity options.
+        /// </summary>
         private readonly ClientApiIndentityOptions configuration;
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SettingsController"/> class.
+        /// </summary>
+        /// <param name="configuration">The configuration.</param>
         public SettingsController(IOptions<ClientApiIndentityOptions> configuration)
         {
             this.configuration = configuration.Value;
@@ -30,7 +37,7 @@ public SettingsController(IOptions<ClientApiIndentityOptions> configuration)
         /// <returns>The portal OIDC settnigs.</returns>
         /// <response code="200">Returns the OIDC settings.</response>
         /// <response code="500">Internal server error.</response>
-        [HttpGet("oidc", Name = "GET OIDC")]
+        [HttpGet("oidc", Name = "GET Open ID settings")]
         [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status500InternalServerError)]
         public IActionResult GetOIDCSettings()
diff --git a/src/AzureIoTHub.Portal/Shared/AzureIoTHub.Portal.Shared.csproj b/src/AzureIoTHub.Portal/Shared/AzureIoTHub.Portal.Shared.csproj
index 6defebf9b..85ea01272 100644
--- a/src/AzureIoTHub.Portal/Shared/AzureIoTHub.Portal.Shared.csproj
+++ b/src/AzureIoTHub.Portal/Shared/AzureIoTHub.Portal.Shared.csproj
@@ -27,6 +27,8 @@
     <PackageReference Include="Microsoft.AspNetCore.Components.DataAnnotations.Validation" Version="3.2.0-rc1.20223.4" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
     <PackageReference Include="MudBlazor" Version="6.0.6" />
+    <PackageReference Include="xunit.extensibility.core" Version="2.4.1" />
+    <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
diff --git a/src/AzureIoTHub.Portal/Shared/Models/v1.0/C2Dresult.cs b/src/AzureIoTHub.Portal/Shared/Models/v1.0/C2Dresult.cs
index 62abb77b7..4c08a28cc 100644
--- a/src/AzureIoTHub.Portal/Shared/Models/v1.0/C2Dresult.cs
+++ b/src/AzureIoTHub.Portal/Shared/Models/v1.0/C2Dresult.cs
@@ -5,8 +5,14 @@ namespace AzureIoTHub.Portal.Shared.Models.V10
 {
     public class C2Dresult
     {
+        /// <summary>
+        /// The C2D result payload.
+        /// </summary>
         public string Payload { get; set; }
 
+        /// <summary>
+        /// The C2D status.
+        /// </summary>
         public int Status { get; set; }
     }
 }
diff --git a/src/AzureIoTHub.Portal/Shared/Models/v1.0/ConfigItem.cs b/src/AzureIoTHub.Portal/Shared/Models/v1.0/ConfigItem.cs
index 25c477b45..eaa6ba55f 100644
--- a/src/AzureIoTHub.Portal/Shared/Models/v1.0/ConfigItem.cs
+++ b/src/AzureIoTHub.Portal/Shared/Models/v1.0/ConfigItem.cs
@@ -1,18 +1,32 @@
 // Copyright (c) CGI France. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using System;
+using System.ComponentModel.DataAnnotations;
+
 namespace AzureIoTHub.Portal.Shared.Models.V10
 {
-    using System;
-
     public class ConfigItem
     {
+        /// <summary>
+        /// The IoT Edge configuration name.
+        /// </summary>
+        [Required(ErrorMessage = "The configuration model name is required.")]
         public string Name { get; set; }
 
+        /// <summary>
+        /// The IoT Edge configuration creation date.
+        /// </summary>
         public DateTime DateCreation { get; set; }
 
+        /// <summary>
+        /// The IoT Edge configuration status.
+        /// </summary>
         public string Status { get; set; }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ConfigItem"/> class.
+        /// </summary>
         public ConfigItem()
         {
             this.DateCreation = new DateTime(1999, 1, 1);
diff --git a/src/AzureIoTHub.Portal/Shared/Models/v1.0/ConfigListItem.cs b/src/AzureIoTHub.Portal/Shared/Models/v1.0/ConfigListItem.cs
index 42c1c6d19..2457c1d86 100644
--- a/src/AzureIoTHub.Portal/Shared/Models/v1.0/ConfigListItem.cs
+++ b/src/AzureIoTHub.Portal/Shared/Models/v1.0/ConfigListItem.cs
@@ -8,27 +8,57 @@ namespace AzureIoTHub.Portal.Shared.Models.V10
 
     public class ConfigListItem
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ConfigListItem"/> class.
+        /// </summary>
         public ConfigListItem()
         {
             this.Modules = new List<GatewayModule>();
         }
 
+        /// <summary>
+        /// The IoT Edge configuration identifier.
+        /// </summary>
         public string ConfigurationID { get; set; }
 
+        /// <summary>
+        /// The IoT Edge configuration target conditions.
+        /// </summary>
         public string Conditions { get; set; }
 
+        /// <summary>
+        /// The IoT Edge configuration targeted metrics.
+        /// </summary>
         public long MetricsTargeted { get; set; }
 
+        /// <summary>
+        /// The IoT Edge configuration applied metrics.
+        /// </summary>
         public long MetricsApplied { get; set; }
 
+        /// <summary>
+        /// The IoT Edge configuration success metrics.
+        /// </summary>
         public long MetricsSuccess { get; set; }
 
+        /// <summary>
+        /// The IoT Edge configuration failure metrics.
+        /// </summary>
         public long MetricsFailure { get; set; }
 
+        /// <summary>
+        /// The IoT Edge configuration priority.
+        /// </summary>
         public int Priority { get; set; }
 
+        /// <summary>
+        /// The IoT Edge configuration creation date.
+        /// </summary>
         public DateTime CreationDate { get; set; }
 
+        ///<summary>
+        /// The IoT Edge modules configuration.
+        /// </summary>
         public List<GatewayModule> Modules { get; set; }
     }
 }
diff --git a/src/AzureIoTHub.Portal/Shared/Models/v1.0/Device/DeviceDetails.cs b/src/AzureIoTHub.Portal/Shared/Models/v1.0/Device/DeviceDetails.cs
index 7e902bcde..860b5b912 100644
--- a/src/AzureIoTHub.Portal/Shared/Models/v1.0/Device/DeviceDetails.cs
+++ b/src/AzureIoTHub.Portal/Shared/Models/v1.0/Device/DeviceDetails.cs
@@ -8,25 +8,52 @@ namespace AzureIoTHub.Portal.Shared.Models.V10.Device
 
     public class DeviceDetails
     {
+        /// <summary>
+        /// The device identifier.
+        /// </summary>
         [Required(ErrorMessage = "The device should have a unique identifier.")]
         public string DeviceID { get; set; }
 
+        /// <summary>
+        /// The name of the device.
+        /// </summary>
         [Required(ErrorMessage = "The device should have a name.")]
         public string DeviceName { get; set; }
 
+        /// <summary>
+        /// The model identifier.
+        /// </summary>
         [Required(ErrorMessage = "The device should use a model.")]
         public string ModelId { get; set; }
 
+        /// <summary>
+        /// The device model image Url.
+        /// </summary>
         public string ImageUrl { get; set; }
 
+        /// <summary>
+        ///   <c>true</c> if this instance is connected; otherwise, <c>false</c>.
+        /// </summary>
         public bool IsConnected { get; set; }
 
+        /// <summary>
+        ///   <c>true</c> if this instance is enabled; otherwise, <c>false</c>.
+        /// </summary>
         public bool IsEnabled { get; set; }
 
+        /// <summary>
+        /// The status updated time.
+        /// </summary>
         public DateTime StatusUpdatedTime { get; set; }
 
+        /// <summary>
+        /// The location code.
+        /// </summary>
         public string LocationCode { get; set; }
 
+        /// <summary>
+        /// The asset identifier.
+        /// </summary>
         public string AssetId { get; set; }
     }
 }
diff --git a/src/AzureIoTHub.Portal/Shared/Models/v1.0/DeviceModel/DeviceModel.cs b/src/AzureIoTHub.Portal/Shared/Models/v1.0/DeviceModel/DeviceModel.cs
index 19cab7f0f..0fa5e8a31 100644
--- a/src/AzureIoTHub.Portal/Shared/Models/v1.0/DeviceModel/DeviceModel.cs
+++ b/src/AzureIoTHub.Portal/Shared/Models/v1.0/DeviceModel/DeviceModel.cs
@@ -4,8 +4,7 @@
 namespace AzureIoTHub.Portal.Shared.Models.V10.DeviceModel
 {
     using System.ComponentModel.DataAnnotations;
-    using Newtonsoft.Json;
-
+    
     public class DeviceModel
     {
         /// <summary>
@@ -14,7 +13,7 @@ public class DeviceModel
         public string ModelId { get; set; }
 
         /// <summary>
-        /// The device model image URL.
+        /// The device model image Url.
         /// </summary>
         public string ImageUrl { get; set; }
 
diff --git a/src/AzureIoTHub.Portal/Shared/Models/v1.0/Gateway.cs b/src/AzureIoTHub.Portal/Shared/Models/v1.0/Gateway.cs
index 89aa87619..fcb497904 100644
--- a/src/AzureIoTHub.Portal/Shared/Models/v1.0/Gateway.cs
+++ b/src/AzureIoTHub.Portal/Shared/Models/v1.0/Gateway.cs
@@ -8,34 +8,76 @@ namespace AzureIoTHub.Portal.Shared.Models.V10
 
     public class Gateway
     {
-        [Required]
+        /// <summary>
+        /// The IoT Edge identifier.
+        /// </summary>
+        [Required(ErrorMessage = "The device identifier is required.")]
         public string DeviceId { get; set; }
 
+        /// <summary>
+        /// The IoT Edge device symmetric key.
+        /// </summary>
         public string SymmetricKey { get; set; }
 
+        /// <summary>
+        /// The IoT Edge connection state.
+        /// </summary>
         public string ConnectionState { get; set; }
 
+        /// <summary>
+        /// The IoT Edge scope tag value.
+        /// </summary>
         public string Scope { get; set; }
 
+        /// <summary>
+        /// The IoT Edge end point.
+        /// </summary>
         public string EndPoint { get; set; }
 
-        [Required]
+        /// <summary>
+        /// The IoT Edge device type.
+        /// </summary>
+        [Required(ErrorMessage = "The device type is required.")]
         public string Type { get; set; }
 
+        /// <summary>
+        /// The IoT Edge device status.
+        /// </summary>
         public string Status { get; set; }
 
+        /// <summary>
+        /// The IoT Edge runtime response.
+        /// </summary>
         public string RuntimeResponse { get; set; }
 
+        /// <summary>
+        /// The number of connected devices on IoT Edge device.
+        /// </summary>
         public int NbDevices { get; set; }
 
+        /// <summary>
+        /// The number of modules on IoT Edge device.
+        /// </summary>
         public int NbModules { get; set; }
 
+        /// <summary>
+        /// The IoT Edge environment tag value.
+        /// </summary>
         public string Environment { get; set; }
 
+        /// <summary>
+        /// The IoT Edge configuraton.
+        /// </summary>
         public ConfigItem LastDeployment { get; set; }
 
+        /// <summary>
+        /// The IoT Edge modules.
+        /// </summary>
         public List<GatewayModule> Modules { get; set; }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Gateway"/> class.
+        /// </summary>
         public Gateway()
         {
             this.Modules = new List<GatewayModule>();
diff --git a/src/AzureIoTHub.Portal/Shared/Models/v1.0/GatewayListItem.cs b/src/AzureIoTHub.Portal/Shared/Models/v1.0/GatewayListItem.cs
index cdd46f543..6cbe239c7 100644
--- a/src/AzureIoTHub.Portal/Shared/Models/v1.0/GatewayListItem.cs
+++ b/src/AzureIoTHub.Portal/Shared/Models/v1.0/GatewayListItem.cs
@@ -1,16 +1,31 @@
 // Copyright (c) CGI France. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using System.ComponentModel.DataAnnotations;
+
 namespace AzureIoTHub.Portal.Shared.Models.V10
 {
     public class GatewayListItem
     {
+        /// <summary>
+        /// The device identifier.
+        /// </summary>
+        [Required(ErrorMessage = "The device identifier is required.")]
         public string DeviceId { get; set; }
 
+        /// <summary>
+        /// The device status.
+        /// </summary>
         public string Status { get; set; }
 
+        /// <summary>
+        /// The device type.
+        /// </summary>
         public string Type { get; set; }
 
+        /// <summary>
+        /// The number of devices connected on the IoT Edge.
+        /// </summary>
         public int NbDevices { get; set; }
     }
 }
diff --git a/src/AzureIoTHub.Portal/Shared/Models/v1.0/GatewayModule.cs b/src/AzureIoTHub.Portal/Shared/Models/v1.0/GatewayModule.cs
index c9f08412b..88849e7d8 100644
--- a/src/AzureIoTHub.Portal/Shared/Models/v1.0/GatewayModule.cs
+++ b/src/AzureIoTHub.Portal/Shared/Models/v1.0/GatewayModule.cs
@@ -4,17 +4,34 @@
 namespace AzureIoTHub.Portal.Shared.Models.V10
 {
     using System.Collections.Generic;
+    using System.ComponentModel.DataAnnotations;
 
     public class GatewayModule
     {
+        /// <summary>
+        /// The module name.
+        /// </summary>
+        [Required(ErrorMessage = "The device model name is required.")]
         public string ModuleName { get; set; }
 
+        /// <summary>
+        /// The module configuration version.
+        /// </summary>
         public string Version { get; set; }
 
+        /// <summary>
+        /// The module status.
+        /// </summary>
         public string Status { get; set; }
 
+        /// <summary>
+        /// The module environment variables.
+        /// </summary>
         public Dictionary<string, string> EnvironmentVariables { get; set; }
 
+        /// <summary>
+        /// The module identity twin settings.
+        /// </summary>
         public Dictionary<string, string> ModuleIdentityTwinSettings { get; set; }
     }
 }
diff --git a/src/AzureIoTHub.Portal/Shared/Models/v1.0/LoRaWAN/Concentrator/Channel.cs b/src/AzureIoTHub.Portal/Shared/Models/v1.0/LoRaWAN/Concentrator/Channel.cs
index 9c59e21d3..0722aa832 100644
--- a/src/AzureIoTHub.Portal/Shared/Models/v1.0/LoRaWAN/Concentrator/Channel.cs
+++ b/src/AzureIoTHub.Portal/Shared/Models/v1.0/LoRaWAN/Concentrator/Channel.cs
@@ -5,16 +5,34 @@ namespace AzureIoTHub.Portal.Shared.Models.V10.LoRaWAN.Concentrator
 {
     public class Channel
     {
+        /// <summary>
+        /// A value indicating whether the channel is enabled.
+        /// </summary>
         public bool? Enable { get; set; }
 
+        /// <summary>
+        /// The frequency.
+        /// </summary>
         public int Freq { get; set; }
 
+        /// <summary>
+        /// The radio.
+        /// </summary>
         public int Radio { get; set; }
 
+        /// <summary>
+        /// The interface.
+        /// </summary>
         public int If { get; set; }
 
+        /// <summary>
+        /// The bandwidth.
+        /// </summary>
         public int Bandwidth { get; set; }
 
+        /// <summary>
+        /// The spread factor.
+        /// </summary>
         public int Spread_factor { get; set; }
     }
 }
diff --git a/src/AzureIoTHub.Portal/Shared/Models/v1.0/LoRaWAN/Concentrator/Concentrator.cs b/src/AzureIoTHub.Portal/Shared/Models/v1.0/LoRaWAN/Concentrator/Concentrator.cs
index 71d3d7419..8807572df 100644
--- a/src/AzureIoTHub.Portal/Shared/Models/v1.0/LoRaWAN/Concentrator/Concentrator.cs
+++ b/src/AzureIoTHub.Portal/Shared/Models/v1.0/LoRaWAN/Concentrator/Concentrator.cs
@@ -7,26 +7,53 @@ namespace AzureIoTHub.Portal.Shared.Models.V10.LoRaWAN.Concentrator
 
     public class Concentrator
     {
+        /// <summary>
+        /// The device identifier.
+        /// </summary>
         [Required]
         [RegularExpression("^[A-F0-9]{16}$", ErrorMessage = "DeviceID must contain 16 hexadecimal characters (numbers from 0 to 9 and/or letters from A to F)")]
         public string DeviceId { get; set; }
 
+        /// <summary>
+        /// The name of the device.
+        /// </summary>
         [Required]
         public string DeviceName { get; set; }
 
+        /// <summary>
+        /// The lora region.
+        /// </summary>
         [Required]
         public string LoraRegion { get; set; }
 
+        /// <summary>
+        /// The type of the device.
+        /// </summary>
         public string DeviceType { get; set; }
 
+        /// <summary>
+        /// The client certificate thumbprint.
+        /// </summary>
         public string ClientCertificateThumbprint { get; set; }
 
+        /// <summary>
+        ///   <c>true</c> if this instance is connected; otherwise, <c>false</c>.
+        /// </summary>
         public bool IsConnected { get; set; }
 
+        /// <summary>
+        ///   <c>true</c> if this instance is enabled; otherwise, <c>false</c>.
+        /// </summary>
         public bool IsEnabled { get; set; }
 
+        /// <summary>
+        ///   <c>true</c> if [already logged in once]; otherwise, <c>false</c>.
+        /// </summary>
         public bool AlreadyLoggedInOnce { get; set; }
 
+        /// <summary>
+        /// The router configuration.
+        /// </summary>
         public RouterConfig RouterConfig { get; set; }
     }
 }
diff --git a/src/AzureIoTHub.Portal/Shared/Models/v1.0/LoRaWAN/Concentrator/RouterConfig.cs b/src/AzureIoTHub.Portal/Shared/Models/v1.0/LoRaWAN/Concentrator/RouterConfig.cs
index b54acaa6d..26dddec0c 100644
--- a/src/AzureIoTHub.Portal/Shared/Models/v1.0/LoRaWAN/Concentrator/RouterConfig.cs
+++ b/src/AzureIoTHub.Portal/Shared/Models/v1.0/LoRaWAN/Concentrator/RouterConfig.cs
@@ -7,26 +7,59 @@ namespace AzureIoTHub.Portal.Shared.Models.V10.LoRaWAN.Concentrator
 
     public class RouterConfig
     {
+        /// <summary>
+        /// The network identifier.
+        /// </summary>
         public List<int> NetID { get; set; }
 
+        /// <summary>
+        /// The join eui.
+        /// </summary>
         public List<List<string>> JoinEui { get; set; }
 
+        /// <summary>
+        /// The region.
+        /// </summary>
         public string Region { get; set; }
 
+        /// <summary>
+        /// The hardware specifications.
+        /// </summary>
         public string Hwspec { get; set; }
 
+        /// <summary>
+        /// The frequency range.
+        /// </summary>
         public List<int> Freq_range { get; set; }
 
+        /// <summary>
+        /// The DRs.
+        /// </summary>
         public List<List<int>> DRs { get; set; }
 
+        /// <summary>
+        /// The SX1301 conf.
+        /// </summary>
         public List<Dictionary<string, Channel>> Sx1301_conf { get; set; }
 
+        /// <summary>
+        ///   <c>true</c> if nocca; otherwise, <c>false</c>.
+        /// </summary>
         public bool Nocca { get; set; }
 
+        /// <summary>
+        ///   <c>true</c> if nodc; otherwise, <c>false</c>.
+        /// </summary>
         public bool Nodc { get; set; }
 
+        /// <summary>
+        ///   <c>true</c> if nodwell; otherwise, <c>false</c>.
+        /// </summary>
         public bool Nodwell { get; set; }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RouterConfig"/> class.
+        /// </summary>
         public RouterConfig()
         {
             this.Region = string.Empty;
diff --git a/src/AzureIoTHub.Portal/Shared/Models/v1.0/LoRaWAN/LoRaDevice/Command.cs b/src/AzureIoTHub.Portal/Shared/Models/v1.0/LoRaWAN/LoRaDevice/Command.cs
index e3d71ba45..063b0be6d 100644
--- a/src/AzureIoTHub.Portal/Shared/Models/v1.0/LoRaWAN/LoRaDevice/Command.cs
+++ b/src/AzureIoTHub.Portal/Shared/Models/v1.0/LoRaWAN/LoRaDevice/Command.cs
@@ -5,8 +5,14 @@ namespace AzureIoTHub.Portal.Shared.Models.V10.LoRaWAN.LoRaDevice
 {
     public class Command
     {
+        /// <summary>
+        /// The command identifier.
+        /// </summary>
         public string CommandId { get; set; }
 
+        /// <summary>
+        /// The frame.
+        /// </summary>
         public string Frame { get; set; }
     }
 }
diff --git a/src/AzureIoTHub.Portal/Shared/Models/v1.0/LoRaWAN/LoRaDevice/LoRaDeviceDetails.cs b/src/AzureIoTHub.Portal/Shared/Models/v1.0/LoRaWAN/LoRaDevice/LoRaDeviceDetails.cs
index f51e2e2d0..cc1eeaf05 100644
--- a/src/AzureIoTHub.Portal/Shared/Models/v1.0/LoRaWAN/LoRaDevice/LoRaDeviceDetails.cs
+++ b/src/AzureIoTHub.Portal/Shared/Models/v1.0/LoRaWAN/LoRaDevice/LoRaDeviceDetails.cs
@@ -21,7 +21,7 @@ public class LoRaDeviceDetails : DeviceDetails
         public string AppKey { get; set; }
 
         /// <summary>
-        /// The sensor decoder API url.
+        /// The sensor decoder API Url.
         /// </summary>
         public string SensorDecoder { get; set; }
 
diff --git a/src/AzureIoTHub.Portal/Shared/Models/v1.0/LoRaWAN/LoRaDeviceModel/LoRaDeviceModel.cs b/src/AzureIoTHub.Portal/Shared/Models/v1.0/LoRaWAN/LoRaDeviceModel/LoRaDeviceModel.cs
index 8f1e40e31..f0d3e7f22 100644
--- a/src/AzureIoTHub.Portal/Shared/Models/v1.0/LoRaWAN/LoRaDeviceModel/LoRaDeviceModel.cs
+++ b/src/AzureIoTHub.Portal/Shared/Models/v1.0/LoRaWAN/LoRaDeviceModel/LoRaDeviceModel.cs
@@ -15,7 +15,7 @@ public class LoRaDeviceModel : DeviceModel.DeviceModel
         public string AppEUI { get; set; }
 
         /// <summary>
-        /// The sensor decoder URL.
+        /// The sensor decoder Url.
         /// </summary>
         public string SensorDecoderURL { get; set; }
 
@@ -32,7 +32,6 @@ public LoRaDeviceModel(DeviceModel.DeviceModel from)
             this.ImageUrl = from.ImageUrl;
         }
 
-
         /// <summary>
         /// Initializes a new instance of the <see cref="LoRaDeviceModel"/> class.
         /// </summary>
diff --git a/src/AzureIoTHub.Portal/Shared/Models/v1.0/RequestPayload.cs b/src/AzureIoTHub.Portal/Shared/Models/v1.0/RequestPayload.cs
deleted file mode 100644
index bd4980b13..000000000
--- a/src/AzureIoTHub.Portal/Shared/Models/v1.0/RequestPayload.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (c) CGI France. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace AzureIoTHub.Portal.Shared.Models.V10
-{
-    class RequestPayload
-    {
-    }
-}
diff --git a/src/AzureIoTHub.Portal/Shared/Models/v1.0/SearchModel.cs b/src/AzureIoTHub.Portal/Shared/Models/v1.0/SearchModel.cs
index 793a843dc..b481b4716 100644
--- a/src/AzureIoTHub.Portal/Shared/Models/v1.0/SearchModel.cs
+++ b/src/AzureIoTHub.Portal/Shared/Models/v1.0/SearchModel.cs
@@ -1,16 +1,34 @@
 // Copyright (c) CGI France. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using System.ComponentModel.DataAnnotations;
+
 namespace AzureIoTHub.Portal.Shared.Models.V10
 {
     public class SearchModel
     {
+        /// <summary>
+        /// The device identifier.
+        /// </summary>
+        [Required(ErrorMessage = "The device identifier is required.")]
         public string DeviceId { get; set; }
 
+        /// <summary>
+        /// The device status.
+        /// </summary>
         public string Status { get; set; }
 
+        /// <summary>
+        /// The device type.
+        /// </summary>
         public string Type { get; set; }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SearchModel"/> class.
+        /// </summary>
+        /// <param name="id">The id.</param>
+        /// <param name="status">The device status.</param>
+        /// <param name="type">The device type.</param>
         public SearchModel(string id = null, string status = null, string type = null)
         {
             this.DeviceId = id;