diff --git a/src/AzureIoTHub.Portal.Server.Tests.Unit/Controllers/v1.0/DevicesControllerTests.cs b/src/AzureIoTHub.Portal.Server.Tests.Unit/Controllers/v1.0/DevicesControllerTests.cs
index 0bdcb4339..6365e3d35 100644
--- a/src/AzureIoTHub.Portal.Server.Tests.Unit/Controllers/v1.0/DevicesControllerTests.cs
+++ b/src/AzureIoTHub.Portal.Server.Tests.Unit/Controllers/v1.0/DevicesControllerTests.cs
@@ -11,7 +11,9 @@ namespace AzureIoTHub.Portal.Server.Tests.Unit.Controllers.V10
     using Azure;
     using Azure.Data.Tables;
     using AzureIoTHub.Portal.Server.Controllers.V10;
+    using AzureIoTHub.Portal.Server.Entities;
     using AzureIoTHub.Portal.Server.Factories;
+    using AzureIoTHub.Portal.Server.Helpers;
     using AzureIoTHub.Portal.Server.Managers;
     using AzureIoTHub.Portal.Server.Mappers;
     using AzureIoTHub.Portal.Server.Services;
@@ -338,5 +340,333 @@ public async Task WhenDeviceNotExistGetEnrollmentCredentialsShouldReturnNotFound
 
             this.mockRepository.VerifyAll();
         }
+
+        [Test]
+        public async Task WhenDeviceNotExistGetPropertiesShouldReturnNotFound()
+        {
+            // Arrange
+            var devicesController = this.CreateDevicesController();
+
+            _ = this.mockDeviceService.Setup(c => c.GetDeviceTwin("aaa"))
+                .ReturnsAsync((Twin)null);
+
+            // Act
+            var response = await devicesController.GetProperties("aaa");
+
+            // Assert
+            Assert.IsNotNull(response);
+            Assert.IsAssignableFrom<NotFoundResult>(response.Result);
+
+            this.mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public async Task WhenDeviceDoesntHaveModelIdNotExistGetPropertiesShouldReturnBadRequest()
+        {
+            // Arrange
+            var devicesController = this.CreateDevicesController();
+            var twin = new Twin();
+
+            _ = this.mockDeviceService.Setup(c => c.GetDeviceTwin("aaa"))
+                .ReturnsAsync(twin);
+
+            // Act
+            var response = await devicesController.GetProperties("aaa");
+
+            // Assert
+            Assert.IsNotNull(response);
+            Assert.IsAssignableFrom<BadRequestObjectResult>(response.Result);
+
+            this.mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public async Task WhenDeviceNotExistSetPropertiesShouldReturnNotFound()
+        {
+            // Arrange
+            var devicesController = this.CreateDevicesController();
+
+            _ = this.mockDeviceService.Setup(c => c.GetDeviceTwin("aaa"))
+                .ReturnsAsync((Twin)null);
+
+            // Act
+            var response = await devicesController.SetProperties("aaa", null);
+
+            // Assert
+            Assert.IsNotNull(response);
+            Assert.IsAssignableFrom<NotFoundResult>(response.Result);
+
+            this.mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public async Task WhenDeviceDoesntHaveModelIdNotExistSetPropertiesShouldReturnBadRequest()
+        {
+            // Arrange
+            var devicesController = this.CreateDevicesController();
+            var twin = new Twin();
+
+            _ = this.mockDeviceService.Setup(c => c.GetDeviceTwin("aaa"))
+                .ReturnsAsync(twin);
+
+            // Act
+            var response = await devicesController.SetProperties("aaa", null);
+
+            // Assert
+            Assert.IsNotNull(response);
+            Assert.IsAssignableFrom<BadRequestObjectResult>(response.Result);
+
+            this.mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public async Task GetPropertiesShouldReturnDeviceProperties()
+        {
+            // Arrange
+            var devicesController = this.CreateDevicesController();
+            var twin = new Twin();
+
+            DeviceHelper.SetTagValue(twin, "ModelId", "bbb");
+            DeviceHelper.SetDesiredProperty(twin, "writable", "ccc");
+
+            var properties = new List<DeviceProperty>();
+
+            var mockTableClient = this.mockRepository.Create<TableClient>();
+            var mockResponse = this.mockRepository.Create<Response>();
+
+            _ = this.mockDeviceService.Setup(c => c.GetDeviceTwin("aaa"))
+                .ReturnsAsync(twin);
+
+            _ = this.mockTableClientFactory.Setup(c => c.GetDeviceTemplateProperties())
+                .Returns(mockTableClient.Object);
+
+            _ = mockTableClient.Setup(c => c.QueryAsync<DeviceModelProperty>(
+                    It.Is<string>(x => x == $"PartitionKey eq 'bbb'"),
+                    It.IsAny<int?>(),
+                    It.IsAny<IEnumerable<string>>(),
+                    It.IsAny<CancellationToken>()))
+                    .Returns(AsyncPageable<DeviceModelProperty>.FromPages(new[]
+                    {
+                        Page<DeviceModelProperty>.FromValues(new[]
+                        {
+                            new DeviceModelProperty
+                            {
+                                RowKey = Guid.NewGuid().ToString(),
+                                PartitionKey = "bbb",
+                                IsWritable = true,
+                                Name = "writable",
+                            },
+                            new DeviceModelProperty
+                            {
+                                RowKey = Guid.NewGuid().ToString(),
+                                PartitionKey = "bbb",
+                                IsWritable = false,
+                                Name = "notwritable",
+                            }
+                        }, null, mockResponse.Object)
+                    }));
+
+            // Act
+            var response = await devicesController.GetProperties("aaa");
+
+            // Assert
+            Assert.IsNotNull(response);
+            Assert.IsNotNull(response.Value);
+
+            Assert.AreEqual(2, response.Value.Count());
+            Assert.AreEqual("ccc", response.Value.Single(x => x.Name == "writable").Value);
+            Assert.IsNull(response.Value.Single(x => x.Name == "notwritable").Value);
+
+            this.mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public async Task SetPropertiesShouldUpdateDesiredProperties()
+        {
+            // Arrange
+            var devicesController = this.CreateDevicesController();
+            var twin = new Twin();
+
+            DeviceHelper.SetTagValue(twin, "ModelId", "bbb");
+
+            var properties = new List<DeviceProperty>();
+
+            var mockTableClient = this.mockRepository.Create<TableClient>();
+            var mockResponse = this.mockRepository.Create<Response>();
+
+            _ = this.mockDeviceService.Setup(c => c.GetDeviceTwin("aaa"))
+                .ReturnsAsync(twin);
+
+            _ = this.mockDeviceService.Setup(c => c.UpdateDeviceTwin(
+                    It.Is<string>(c => c == "aaa"),
+                    It.Is<Twin>(c => c == twin)))
+                .ReturnsAsync(twin);
+
+            _ = this.mockTableClientFactory.Setup(c => c.GetDeviceTemplateProperties())
+                .Returns(mockTableClient.Object);
+
+            _ = mockTableClient.Setup(c => c.QueryAsync<DeviceModelProperty>(
+                    It.Is<string>(x => x == $"PartitionKey eq 'bbb'"),
+                    It.IsAny<int?>(),
+                    It.IsAny<IEnumerable<string>>(),
+                    It.IsAny<CancellationToken>()))
+                    .Returns(AsyncPageable<DeviceModelProperty>.FromPages(new[]
+                    {
+                        Page<DeviceModelProperty>.FromValues(new[]
+                        {
+                            new DeviceModelProperty
+                            {
+                                RowKey = Guid.NewGuid().ToString(),
+                                PartitionKey = "bbb",
+                                IsWritable = true,
+                                Name = "writable",
+                            }
+                        }, null, mockResponse.Object)
+                    }));
+
+            // Act
+            var response = await devicesController.SetProperties("aaa", new[]
+            {
+                new DevicePropertyValue
+                {
+                    Name = "writable",
+                    Value = "ccc"
+                }
+            });
+
+            // Assert
+            Assert.IsNotNull(response);
+            Assert.IsAssignableFrom<OkResult>(response.Result);
+
+            Assert.AreEqual("ccc", twin.Properties.Desired["writable"].ToString());
+
+            this.mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public async Task WhenPropertyNotWrittableSetPropertiesShouldNotUpdateDesiredProperty()
+        {
+            // Arrange
+            var devicesController = this.CreateDevicesController();
+            var twin = new Twin();
+
+            DeviceHelper.SetTagValue(twin, "ModelId", "bbb");
+
+            var properties = new List<DeviceProperty>();
+
+            var mockTableClient = this.mockRepository.Create<TableClient>();
+            var mockResponse = this.mockRepository.Create<Response>();
+
+            _ = this.mockDeviceService.Setup(c => c.GetDeviceTwin("aaa"))
+                .ReturnsAsync(twin);
+
+            _ = this.mockDeviceService.Setup(c => c.UpdateDeviceTwin(
+                It.Is<string>(c => c == "aaa"),
+                It.Is<Twin>(c => c == twin)))
+            .ReturnsAsync(twin);
+
+            _ = this.mockTableClientFactory.Setup(c => c.GetDeviceTemplateProperties())
+                .Returns(mockTableClient.Object);
+
+            _ = mockTableClient.Setup(c => c.QueryAsync<DeviceModelProperty>(
+                    It.Is<string>(x => x == $"PartitionKey eq 'bbb'"),
+                    It.IsAny<int?>(),
+                    It.IsAny<IEnumerable<string>>(),
+                    It.IsAny<CancellationToken>()))
+                    .Returns(AsyncPageable<DeviceModelProperty>.FromPages(new[]
+                    {
+                        Page<DeviceModelProperty>.FromValues(new[]
+                        {
+                            new DeviceModelProperty
+                            {
+                                RowKey = Guid.NewGuid().ToString(),
+                                PartitionKey = "bbb",
+                                IsWritable = false,
+                                Name = "notwritable",
+                            }
+                        }, null, mockResponse.Object)
+                    }));
+
+            // Act
+            var response = await devicesController.SetProperties("aaa", new[]
+            {
+                new DevicePropertyValue
+                {
+                    Name = "notwritable",
+                    Value = "ccc"
+                }
+            });
+
+            // Assert
+            Assert.IsNotNull(response);
+            Assert.IsAssignableFrom<OkResult>(response.Result);
+
+            Assert.IsFalse(twin.Properties.Desired.Contains("notwritable"));
+
+            this.mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public async Task WhenPropertyNotInModelSetPropertiesShouldNotUpdateDesiredProperty()
+        {
+            // Arrange
+            var devicesController = this.CreateDevicesController();
+            var twin = new Twin();
+
+            DeviceHelper.SetTagValue(twin, "ModelId", "bbb");
+
+            var properties = new List<DeviceProperty>();
+
+            var mockTableClient = this.mockRepository.Create<TableClient>();
+            var mockResponse = this.mockRepository.Create<Response>();
+
+            _ = this.mockDeviceService.Setup(c => c.GetDeviceTwin("aaa"))
+                .ReturnsAsync(twin);
+
+            _ = this.mockDeviceService.Setup(c => c.UpdateDeviceTwin(
+                It.Is<string>(c => c == "aaa"),
+                It.Is<Twin>(c => c == twin)))
+            .ReturnsAsync(twin);
+
+            _ = this.mockTableClientFactory.Setup(c => c.GetDeviceTemplateProperties())
+                .Returns(mockTableClient.Object);
+
+            _ = mockTableClient.Setup(c => c.QueryAsync<DeviceModelProperty>(
+                    It.Is<string>(x => x == $"PartitionKey eq 'bbb'"),
+                    It.IsAny<int?>(),
+                    It.IsAny<IEnumerable<string>>(),
+                    It.IsAny<CancellationToken>()))
+                    .Returns(AsyncPageable<DeviceModelProperty>.FromPages(new[]
+                    {
+                        Page<DeviceModelProperty>.FromValues(new[]
+                        {
+                            new DeviceModelProperty
+                            {
+                                RowKey = Guid.NewGuid().ToString(),
+                                PartitionKey = "bbb",
+                                IsWritable = true,
+                                Name = "writable",
+                            }
+                        }, null, mockResponse.Object)
+                    }));
+
+            // Act
+            var response = await devicesController.SetProperties("aaa", new[]
+            {
+                new DevicePropertyValue
+                {
+                    Name = "unknown",
+                    Value = "eee"
+                }
+            });
+
+            // Assert
+            Assert.IsNotNull(response);
+            Assert.IsAssignableFrom<OkResult>(response.Result);
+
+            Assert.IsFalse(twin.Properties.Desired.Contains("unknown"));
+
+            this.mockRepository.VerifyAll();
+        }
     }
 }
diff --git a/src/AzureIoTHub.Portal.Server.Tests.Unit/Converters/StringToBoolConverterTests.cs b/src/AzureIoTHub.Portal.Server.Tests.Unit/Converters/StringToBoolConverterTests.cs
new file mode 100644
index 000000000..f9b34ee83
--- /dev/null
+++ b/src/AzureIoTHub.Portal.Server.Tests.Unit/Converters/StringToBoolConverterTests.cs
@@ -0,0 +1,65 @@
+// 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.Server.Tests.Unit.Converters
+{
+    using AzureIoTHub.Portal.Client.Converters;
+    using Moq;
+    using NUnit.Framework;
+
+    [TestFixture]
+    public class StringToBoolConverterTests
+    {
+        private MockRepository mockRepository;
+
+        [SetUp]
+        public void SetUp()
+        {
+            this.mockRepository = new MockRepository(MockBehavior.Strict);
+
+
+        }
+
+        private static StringToBoolConverter CreateStringToBoolConverter()
+        {
+            return new StringToBoolConverter();
+        }
+
+        [TestCase(true, "true")]
+        [TestCase(false, "false")]
+        [TestCase(null, null)]
+        public void GetShouldReturnStringRepresentationOfBool(bool? value, string expected)
+        {
+            // Arrange
+            var stringToBoolConverter = CreateStringToBoolConverter();
+
+            // Act
+            var result = stringToBoolConverter.Get(value);
+
+            // Assert
+            Assert.AreEqual(expected, result);
+            this.mockRepository.VerifyAll();
+        }
+
+        [TestCase("true", true)]
+        [TestCase("false", false)]
+        [TestCase("True", true)]
+        [TestCase("False", false)]
+        [TestCase("TRUE", true)]
+        [TestCase("FALSE", false)]
+        [TestCase("1", null)]
+        [TestCase(null, null)]
+        public void SetShouldReturnStringRepresentationOfBool(string value, bool? expected)
+        {
+            // Arrange
+            var stringToBoolConverter = CreateStringToBoolConverter();
+
+            // Act
+            var result = stringToBoolConverter.Set(value);
+
+            // Assert
+            Assert.AreEqual(expected, result);
+            this.mockRepository.VerifyAll();
+        }
+    }
+}
diff --git a/src/AzureIoTHub.Portal.Server.Tests.Unit/Pages/DevicesModels/CreateDeviceModelPageTests.cs b/src/AzureIoTHub.Portal.Server.Tests.Unit/Pages/DevicesModels/CreateDeviceModelPageTests.cs
index c93988192..5e4a00404 100644
--- a/src/AzureIoTHub.Portal.Server.Tests.Unit/Pages/DevicesModels/CreateDeviceModelPageTests.cs
+++ b/src/AzureIoTHub.Portal.Server.Tests.Unit/Pages/DevicesModels/CreateDeviceModelPageTests.cs
@@ -8,7 +8,6 @@ namespace AzureIoTHub.Portal.Server.Tests.Unit.Pages
     using System.Linq;
     using System.Net.Http;
     using System.Net.Http.Json;
-    using System.Threading.Tasks;
     using AzureIoTHub.Portal.Client.Pages.DeviceModels;
     using AzureIoTHub.Portal.Server.Tests.Unit.Helpers;
     using AzureIoTHub.Portal.Shared.Models;
diff --git a/src/AzureIoTHub.Portal/Client/Converters/StringToBoolConverter.cs b/src/AzureIoTHub.Portal/Client/Converters/StringToBoolConverter.cs
new file mode 100644
index 000000000..69cc6a781
--- /dev/null
+++ b/src/AzureIoTHub.Portal/Client/Converters/StringToBoolConverter.cs
@@ -0,0 +1,28 @@
+// 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.Client.Converters
+{
+    using MudBlazor;
+
+    public class StringToBoolConverter : BoolConverter<string>
+    {
+        public StringToBoolConverter()
+        {
+            SetFunc = OnSet;
+            GetFunc = OnGet;
+        }
+
+        private string OnGet(bool? value) => value?.ToString()?.ToLowerInvariant();
+
+        private bool? OnSet(string arg)
+        {
+            if (!bool.TryParse(arg, out var value))
+            {
+                return null;
+            }
+
+            return value;
+        }
+    }
+}
diff --git a/src/AzureIoTHub.Portal/Client/Extensions/EnumerableExtension.cs b/src/AzureIoTHub.Portal/Client/Extensions/EnumerableExtension.cs
new file mode 100644
index 000000000..e550bc3b4
--- /dev/null
+++ b/src/AzureIoTHub.Portal/Client/Extensions/EnumerableExtension.cs
@@ -0,0 +1,21 @@
+// 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.Client.Extensions
+{
+    using System.Collections.Generic;
+    using System.Linq;
+
+    public static class EnumerableExtension
+    {
+        public static int Next(this IEnumerable<int> source)
+        {
+            if (!source.Any())
+            {
+                return 0;
+            }
+
+            return source.Max() + 1;
+        }
+    }
+}
diff --git a/src/AzureIoTHub.Portal/Client/Pages/DeviceModels/CreateDeviceModelPage.razor b/src/AzureIoTHub.Portal/Client/Pages/DeviceModels/CreateDeviceModelPage.razor
index 23bb1126b..8ae496e06 100644
--- a/src/AzureIoTHub.Portal/Client/Pages/DeviceModels/CreateDeviceModelPage.razor
+++ b/src/AzureIoTHub.Portal/Client/Pages/DeviceModels/CreateDeviceModelPage.razor
@@ -87,38 +87,47 @@
                                         <MudText>Properties</MudText>
                                     </MudItem>
                                     <MudItem xs="12">
-                                        <MudButton Variant="Variant.Text" Color="Color.Primary" OnClick="@(() => Properties.Add(new DeviceProperty()))" StartIcon="@Icons.Filled.Add" id="addPropertyButton">Add property</MudButton>
+                                        <MudButton Variant="Variant.Text" Color="Color.Primary" OnClick="@(() => Properties.Add(new DeviceProperty() {  Order = Properties.Select(x => x.Order).Next() }))" StartIcon="@Icons.Filled.Add" id="addPropertyButton">Add property</MudButton>
                                     </MudItem>
                                     <MudItem xs="12">
-                                        @foreach (var item in this.Properties)
-                                        {
-                                            <MudGrid id="@($"property-{item.Name}")">
-                                                <MudItem md="4" xs="12">
-                                                    <MudTextField id="@nameof(item.DisplayName)"
+                                        @foreach (var item in this.Properties.OrderBy(x => x.Order))
+                                            {
+                                                <MudGrid id="@($"property-{item.Name}")">
+                                                    <MudItem md="4" xs="12">
+                                                        <MudTextField id="@nameof(item.DisplayName)"
                                                           @bind-Value="@item.DisplayName"
                                                           Label="Display name"
                                                           Variant="Variant.Outlined"
                                                           For="@(()=> item.DisplayName)"
                                                           Required="true" />
-                                                </MudItem>
-                                                <MudItem md="4" xs="12">
-                                                    <MudTextField id="@nameof(item.Name)" @bind-Value="@item.Name"
+                                                    </MudItem>
+                                                    <MudItem md="3" xs="12">
+                                                        <MudTextField id="@nameof(item.Name)" @bind-Value="@item.Name"
                                                           Label="Name"
                                                           Variant="Variant.Outlined"
                                                           For="@(()=> item.Name)"
                                                           Required="true" />
-                                                </MudItem>
-                                                <MudItem md="2" xs="6">
-                                                    <MudSelect id="@nameof(item.PropertyType)"
+                                                    </MudItem>
+                                                    <MudItem md="1" xs="12">
+                                                        <MudNumericField id="@nameof(item.Order)"
+                                                              @bind-Value="@item.Order"
+                                                              Label="Order"
+                                                              Variant="Variant.Outlined"
+                                                              Min=0
+                                                              For="@(()=> item.Order)"
+                                                              Required="true" />
+                                                    </MudItem>
+                                                    <MudItem md="2" xs="6">
+                                                        <MudSelect id="@nameof(item.PropertyType)"
                                                        @bind-Value="@item.PropertyType"
                                                        Label="Type"
                                                        Variant="Variant.Outlined"
                                                        For="@(()=> item.PropertyType)"
                                                        Required="true">
-                                                        @foreach (DevicePropertyType item in Enum.GetValues(typeof(DevicePropertyType)))
-                                                        {
+                                                            @foreach (DevicePropertyType item in Enum.GetValues(typeof(DevicePropertyType)))
+                                                            {
                                                     <MudSelectItem Value="@item">@item</MudSelectItem>
-                                                        }
+                                                            }
                                             </MudSelect>
                                         </MudItem>
                                         <MudItem md="1" xs="3">
@@ -129,7 +138,7 @@
                                             <MudIconButton id="DeletePropertyButton" Icon="@Icons.Filled.Delete" OnClick="@(() => Properties.Remove(item))">Remove</MudIconButton>
                                         </MudItem>
                                     </MudGrid>
-                                        }
+                                            }
                                     </MudItem>
                                 }
                             </MudGrid>
diff --git a/src/AzureIoTHub.Portal/Client/Pages/DeviceModels/DeviceModelDetailPage.razor b/src/AzureIoTHub.Portal/Client/Pages/DeviceModels/DeviceModelDetailPage.razor
index 7b8359025..7a7a9f6a8 100644
--- a/src/AzureIoTHub.Portal/Client/Pages/DeviceModels/DeviceModelDetailPage.razor
+++ b/src/AzureIoTHub.Portal/Client/Pages/DeviceModels/DeviceModelDetailPage.razor
@@ -79,10 +79,10 @@ else
                                             <MudText>Properties</MudText>
                                         </MudItem>
                                         <MudItem xs="12">
-                                            <MudButton Variant="Variant.Text" Color="Color.Primary" OnClick="@(() => Properties.Add(new DeviceProperty()))" StartIcon="@Icons.Filled.Add" id="addPropertyButton">Add property</MudButton>
+                                            <MudButton Variant="Variant.Text" Color="Color.Primary" OnClick="@(() => Properties.Add(new DeviceProperty() {  Order = Properties.Select(x => x.Order).Next() }))" StartIcon="@Icons.Filled.Add" id="addPropertyButton">Add property</MudButton>
                                         </MudItem>
                                         <MudItem xs="12">
-                                            @foreach (var item in this.Properties)
+                                            @foreach (var item in this.Properties.OrderBy(x => x.Order))
                                             {
                                                 <MudGrid id="@($"property-{item.Name}")">
                                                     <MudItem md="4" xs="12">
@@ -93,13 +93,22 @@ else
                                                           For="@(()=> item.DisplayName)"
                                                           Required="true" />
                                                     </MudItem>
-                                                    <MudItem md="4" xs="12">
+                                                    <MudItem md="3" xs="12">
                                                         <MudTextField id="@nameof(item.Name)" @bind-Value="@item.Name"
                                                           Label="Name"
                                                           Variant="Variant.Outlined"
                                                           For="@(()=> item.Name)"
                                                           Required="true" />
                                                     </MudItem>
+                                                    <MudItem md="1" xs="12">
+                                                        <MudNumericField id="@nameof(item.Order)"
+                                                              @bind-Value="@item.Order"
+                                                              Label="Order"
+                                                              Variant="Variant.Outlined"
+                                                              Min=0
+                                                              For="@(()=> item.Order)"
+                                                              Required="true" />
+                                                    </MudItem>
                                                     <MudItem md="2" xs="6">
                                                         <MudSelect id="@nameof(item.PropertyType)"
                                                        @bind-Value="@item.PropertyType"
diff --git a/src/AzureIoTHub.Portal/Client/Pages/Devices/CreateDevicePage.razor b/src/AzureIoTHub.Portal/Client/Pages/Devices/CreateDevicePage.razor
index a1cc8d26b..bf7001e5c 100644
--- a/src/AzureIoTHub.Portal/Client/Pages/Devices/CreateDevicePage.razor
+++ b/src/AzureIoTHub.Portal/Client/Pages/Devices/CreateDevicePage.razor
@@ -1,6 +1,8 @@
 @page "/devices/new"
 @using AzureIoTHub.Portal.Client.Pages.Devices.LoRaWAN
 @using AzureIoTHub.Portal.Client.Validators
+@using AzureIoTHub.Portal.Shared.Models
+@using AzureIoTHub.Portal.Shared.Models.v10
 @using AzureIoTHub.Portal.Shared.Models.v10.Device
 @using AzureIoTHub.Portal.Shared.Models.v10.DeviceModel
 @using AzureIoTHub.Portal.Shared.Models.v10.LoRaWAN.LoRaDevice
@@ -43,15 +45,18 @@
                             <MudGrid>
                                 <MudItem xs="12" md="6">
                                     <MudAutocomplete T="DeviceModel"
-                                                     @bind-Value="Model"
-                                                     Label="Model*"
-                                                     Dense="true" Variant="Variant.Outlined"
+                                                     ValueChanged=@ChangeModel
                                                      SearchFunc="@Search"
+                                                     Label="Model*"
+                                                     Dense=true
+                                                     For=@(() => DeviceModel)
+                                                     Variant="Variant.Outlined"
                                                      ToStringFunc="@(x => x.Name)"
-                                                     For="@(()=> Model)"
-                                                     ResetValueOnEmptyText="true"
-                                                     Immediate="true" Clearable="true"
-                                                     CoerceText="true" CoerceValue="false" />
+                                                     ResetValueOnEmptyText=true
+                                                     Immediate=true
+                                                     Clearable=true
+                                                     CoerceText=true
+                                                     CoerceValue=false />
                                     @if (Device.ModelId == null && displayValidationErrorMessages)
                                     {
                                         <p class="validation-error-message">The Model is required.</p>
@@ -72,16 +77,6 @@
                                                   For="@(()=> Device.DeviceName)"
                                                   Required="true" />
                                 </MudItem>
-
-                                @foreach (DeviceTag tag in TagList)
-                                {
-                                    <MudItem xs="12" md="6">
-                                        <MudTextField @bind-Value="Device.Tags[tag.Name]" Label="@tag.Label"
-                                                  Required="@tag.Required"
-                                                  Variant="Variant.Outlined" />
-                                    </MudItem>
-                                }
-
                                 <MudItem xs="12">
                                     <MudText>
                                         <b>Status</b>
@@ -96,6 +91,76 @@
                                         <MudText Typo="Typo.body2">The device <b>cannot</b> connect to the platform.</MudText>
                                     }
                                 </MudItem>
+
+                                <MudItem xs="12">
+                                    <MudText Typo="Typo.h6" Class="mb-4">Tags</MudText>
+                                </MudItem>
+                                @foreach (DeviceTag tag in TagList)
+                                {
+                                    <MudItem xs="12" md="6">
+                                        <MudTextField @bind-Value="Device.Tags[tag.Name]" Label="@tag.Label"
+                                                  Required="@tag.Required"
+                                                  Variant="Variant.Outlined" />
+                                    </MudItem>
+                                }
+                                @if (!IsLoRa)
+                                {
+                                    <MudItem xs="12">
+                                        <MudText Typo="Typo.h6" Class="mb-4">Properties</MudText>
+                                    </MudItem>
+                                    @foreach (var item in Properties.OrderBy(c => c.Order))
+                                    {
+                                        switch (item.PropertyType)
+                                        {
+                                            case DevicePropertyType.Boolean:
+                                                <MudItem xs="12" md="4">
+                                                    <MudCheckBox @bind-Checked="item.Value" Label="@item.DisplayName" Color="@Color.Primary" Converter="@(new StringToBoolConverter())" TriState="true" />
+                                                </MudItem>
+                                                break;
+                                            case DevicePropertyType.Double:
+                                                <MudItem xs="12" md="4">
+                                                    <MudTextField @bind-Value="item.Value"
+                                                  Label="@item.DisplayName"
+                                                  Variant="Variant.Outlined"
+                                                  Validation=@((string c) => string.IsNullOrEmpty(c) || double.TryParse(c, out var result))
+                                                  Clearable="true" />
+                                                </MudItem>
+                                                break;
+                                            case DevicePropertyType.Float:
+                                                <MudItem xs="12" md="4">
+                                                    <MudTextField @bind-Value="item.Value"
+                                                  Label="@item.DisplayName"
+                                                  Variant="Variant.Outlined"
+                                                  Validation=@((string c) => string.IsNullOrEmpty(c) || float.TryParse(c, out var result))
+                                                  Clearable="true" />
+                                                </MudItem>
+                                                break;
+                                            case DevicePropertyType.Integer:
+                                                <MudItem xs="12" md="4">
+                                                    <MudTextField @bind-Value="item.Value"
+                                                  Label="@item.DisplayName"
+                                                  Variant="Variant.Outlined"
+                                                  Validation=@((string c) => string.IsNullOrEmpty(c) || int.TryParse(c, out var result))
+                                                  Clearable="true" />
+                                                </MudItem>
+                                                break;
+                                            case DevicePropertyType.Long:
+                                                <MudItem xs="12" md="4">
+                                                    <MudTextField @bind-Value="item.Value"
+                                                  Label="@item.DisplayName"
+                                                  Variant="Variant.Outlined"
+                                                  Validation=@((string c) => string.IsNullOrEmpty(c) || long.TryParse(c, out var result))
+                                                  Clearable="true" />
+                                                </MudItem>
+                                                break;
+                                            case DevicePropertyType.String:
+                                                <MudItem xs="12" md="12">
+                                                    <MudTextField @bind-Value="item.Value" Label="@item.DisplayName" Format="F1" Variant="Variant.Outlined" Clearable="true" />
+                                                </MudItem>
+                                                break;
+                                        }
+                                    }
+                                }
                             </MudGrid>
                         </MudCardContent>
                         <MudCardActions Class="pb-4 pl-4">
@@ -122,20 +187,10 @@
     private string ApiUrlBase => this.IsLoRa ? "/api/lorawan/devices" : "api/devices";
     private DeviceDetailsValidator standardValidator = new DeviceDetailsValidator();
     private LoRaDeviceDetailsValidator loraValidator = new LoRaDeviceDetailsValidator();
-    private DeviceModel Model
-    {
-        get
-        {
-            return DeviceModelList.SingleOrDefault(x => x.ModelId == Device.ModelId);
-        }
-        set
-        {
-            ChangeModel(value);
-        }
-    }
     private LoRaDeviceModel loRaDeviceModel { get; set; }
 
-    private bool IsLoRa => this.Model?.SupportLoRaFeatures ?? false;
+
+    private bool IsLoRa => DeviceModelList.SingleOrDefault(c => c.ModelId == Device.ModelId)?.SupportLoRaFeatures ?? false;
 
     [Parameter]
     public string DeviceID { get; set; }
@@ -143,9 +198,9 @@
     private DeviceDetails Device { get; set; } = new DeviceDetails();
 
     private IEnumerable<DeviceModel> DeviceModelList { get; set; } = new List<DeviceModel>();
-
+    private DeviceModel DeviceModel;
     private IEnumerable<DeviceTag> TagList { get; set; } = new List<DeviceTag>();
-    private Dictionary<string, string> TagDict { get; set; } = new Dictionary<string, string>();
+    private List<DevicePropertyValue> Properties = new List<DevicePropertyValue>();
 
     private bool displayValidationErrorMessages = false;
 
@@ -159,11 +214,11 @@
 
         // Gets the custom tags that can be set when creating a device
         TagList = await Http.GetFromJsonAsync<List<DeviceTag>>($"/api/settings/device-tags");
+
         foreach (DeviceTag tag in TagList)
         {
-            TagDict.Add(tag.Name, "");
+            Device.Tags.Add(tag.Name, "");
         }
-        Device.Tags = TagDict;
     }
 
     /// <summary>
@@ -183,13 +238,6 @@
             // Allows to display ValidationError messages for the MudAutocomplete field.
             displayValidationErrorMessages = true;
 
-            //if (IsLoRa)
-            //{
-            //    var loraValidation = this.loraValidator.Validate(this.Device as LoRaDeviceDetails);
-
-            //    loraValidation.Errors.ForEach(x => Console.WriteLine(x.ErrorMessage));
-            //}
-
             return;
         }
 
@@ -202,6 +250,10 @@
 
         result.EnsureSuccessStatusCode();
 
+        await Http.PostAsJsonAsync($"{ApiUrlBase}/{DeviceID}/properties", Properties);
+
+        result.EnsureSuccessStatusCode();
+
         // Prompts a snack bar to inform the action was successful
         Snackbar.Add($"Device {Device.DeviceID} has been successfully created!", Severity.Success);
 
@@ -241,20 +293,39 @@
                     .Where(x => x.Name.StartsWith(value, StringComparison.InvariantCultureIgnoreCase));
     }
 
-    private void ChangeModel(DeviceModel model)
+    private async Task ChangeModel(DeviceModel model)
     {
+        Properties.Clear();
+
+        Device = new DeviceDetails
+            {
+                DeviceID = Device.DeviceID,
+                ModelId = model?.ModelId,
+                ImageUrl = model?.ImageUrl,
+                DeviceName = Device.DeviceName,
+                IsEnabled = Device.IsEnabled,
+                Tags = Device.Tags
+            };
+
+        if (model == null)
+        {
+            return;
+        }
+
         if (model?.SupportLoRaFeatures ?? false)
         {
             var device = new LoRaDeviceDetails
                 {
                     DeviceID = Device.DeviceID,
+                    ModelId = model.ModelId,
                     DeviceName = Device.DeviceName,
-                    IsEnabled = Device.IsEnabled
+                    IsEnabled = Device.IsEnabled,
+                    Tags = Device.Tags
                 };
 
             Device = device;
 
-            Http.GetFromJsonAsync<LoRaDeviceModel>($"api/lorawan/models/{model.ModelId}")
+            await Http.GetFromJsonAsync<LoRaDeviceModel>($"api/lorawan/models/{model.ModelId}")
                 .ContinueWith(c =>
                 {
                     device.AppEUI = c.Result.AppEUI;
@@ -264,17 +335,19 @@
         }
         else
         {
-            Device = new DeviceDetails
-                {
-                    DeviceID = Device.DeviceID,
-                    DeviceName = Device.DeviceName,
-                    IsEnabled = Device.IsEnabled
-                };
+            await Http.GetFromJsonAsync<IEnumerable<DeviceProperty>>($"api/models/{model.ModelId}/properties")
+            .ContinueWith(c =>
+            {
+                Properties.AddRange(c.Result.Select(x => new DevicePropertyValue
+                    {
+                        DisplayName = x.DisplayName,
+                        IsWritable = x.IsWritable,
+                        Name = x.Name,
+                        Order = x.Order,
+                        PropertyType = x.PropertyType
+                    }));
+            });
         }
-
-        Device.ModelId = model?.ModelId;
-        Device.ImageUrl = model?.ImageUrl;
-        Device.Tags = TagDict;
     }
 }
 
diff --git a/src/AzureIoTHub.Portal/Client/Pages/Devices/DeviceDetailPage.razor b/src/AzureIoTHub.Portal/Client/Pages/Devices/DeviceDetailPage.razor
index 4113dd8ad..075524459 100644
--- a/src/AzureIoTHub.Portal/Client/Pages/Devices/DeviceDetailPage.razor
+++ b/src/AzureIoTHub.Portal/Client/Pages/Devices/DeviceDetailPage.razor
@@ -1,6 +1,7 @@
 @page "/devices/{DeviceID}"
 @using AzureIoTHub.Portal.Client.Pages.Devices.LoRaWAN
 @using AzureIoTHub.Portal.Client.Validators
+@using AzureIoTHub.Portal.Shared.Models
 @using AzureIoTHub.Portal.Shared.Models.v10.Device
 @using AzureIoTHub.Portal.Shared.Models.v10.DeviceModel
 @using AzureIoTHub.Portal.Shared.Models.v10.LoRaWAN.LoRaDevice
@@ -57,23 +58,13 @@
                                                   ReadOnly="true"
                                                   HelperText="DeviceID must contain 16 hexadecimal characters (numbers from 0 to 9 and/or letters from A to F)" />
                                 </MudItem>
-                                <MudItem xs="12">
+                                <MudItem xs="12" md="6">
                                     <MudTextField @bind-Value="@Device.DeviceName"
                                                   Label="Device name"
                                                   Variant="Variant.Outlined"
                                                   For="@(()=> Device.DeviceName)"
                                                   Required="true" />
                                 </MudItem>
-
-                                @foreach (DeviceTag tag in TagList)
-                                {
-                                    <MudItem xs="12" md="6">
-                                        <MudTextField @bind-Value="Device.Tags[tag.Name]" Label="@tag.Label"
-                                                  Required="@tag.Required"
-                                                  Variant="Variant.Outlined" />
-                                    </MudItem>
-                                }
-
                                 <MudItem xs="12">
                                     <MudText>
                                         <b>Status</b>
@@ -88,6 +79,81 @@
                                         <MudText Typo="Typo.body2">The device <b>cannot</b> connect to the platform.</MudText>
                                     }
                                 </MudItem>
+                                <MudItem xs="12">
+                                    <MudText Typo="Typo.h6" Class="mb-4">Tags</MudText>
+                                </MudItem>
+                                @foreach (DeviceTag tag in TagList)
+                                {
+                                    <MudItem xs="12" md="6">
+                                        <MudTextField @bind-Value="Device.Tags[tag.Name]" Label="@tag.Label"
+                                                  Required="@tag.Required"
+                                                  Variant="Variant.Outlined" />
+                                    </MudItem>
+                                }
+
+                                @if (!IsLoRa)
+                                {
+                                    <MudItem xs="12">
+                                        <MudText Typo="Typo.h6" Class="mb-4">Properties</MudText>
+                                    </MudItem>
+                                    @foreach (var item in Properties.OrderBy(c => c.Order))
+                                    {
+                                        switch (item.PropertyType)
+                                        {
+                                            case DevicePropertyType.Boolean:
+                                                <MudItem xs="12" md="4">
+                                                    <MudCheckBox @bind-Checked="item.Value" Label="@item.DisplayName" Color="@Color.Primary" Converter="@(new StringToBoolConverter())" TriState="true" />
+                                                </MudItem>
+                                                break;
+                                            case DevicePropertyType.Double:
+                                                <MudItem xs="12" md="4">
+                                                    <MudTextField
+                                                        @bind-Value="item.Value"
+                                                        Label="@item.DisplayName"
+                                                        Variant="Variant.Outlined"
+                                                        Validation=@((string c) => string.IsNullOrEmpty(c) || double.TryParse(c, out var result))
+                                                        Clearable="true" />
+                                                </MudItem>
+                                                break;
+                                            case DevicePropertyType.Float:
+                                                <MudItem xs="12" md="4">
+                                                    <MudTextField
+                                                        @bind-Value="item.Value"
+                                                        Label="@item.DisplayName"
+                                                        Variant="Variant.Outlined"
+                                                        Validation=@((string c) =>  string.IsNullOrEmpty(c) || float.TryParse(c, out var result))
+                                                        Clearable="true" />
+                                                </MudItem>
+                                                break;
+                                            case DevicePropertyType.Integer:
+                                                <MudItem xs="12" md="4">
+                                                    <MudTextField
+                                                        @bind-Value="item.Value"
+                                                        Label="@item.DisplayName"
+                                                        Variant="Variant.Outlined"
+                                                        Validation=@((string c) =>  string.IsNullOrEmpty(c) || int.TryParse(c, out var result))
+                                                        Clearable="true" />
+                                                </MudItem>
+                                                break;
+                                            case DevicePropertyType.Long:
+                                                <MudItem xs="12" md="4">
+                                                    <MudTextField
+                                                        @bind-Value="item.Value"
+                                                        Label="@item.DisplayName"
+                                                        Variant="Variant.Outlined"
+                                                        Validation=@((string c) =>  string.IsNullOrEmpty(c) || long.TryParse(c, out var result))
+                                                        Clearable="true" />
+                                                </MudItem>
+                                                break;
+                                            case DevicePropertyType.String:
+                                                <MudItem xs="12" md="12">
+                                                    <MudTextField @bind-Value="item.Value" Label="@item.DisplayName" Format="F1" Variant="Variant.Outlined" Clearable="true" />
+                                                </MudItem>
+                                                break;
+                                        }
+
+                                    }
+                                }
                             </MudGrid>
                         </MudCardContent>
                         <MudCardActions Class="pb-4 pl-4">
@@ -130,11 +196,13 @@
 
     private bool isLoaded = false;
 
-    private IEnumerable<DeviceModel> DeviceModelList { get; set; } = new List<DeviceModel>();
+    private IEnumerable<DeviceModel> DeviceModelList { get; set; } = Array.Empty<DeviceModel>();
 
     private IEnumerable<DeviceModelCommand> Commands { get; set; }
 
-    private IEnumerable<DeviceTag> TagList { get; set; } = new List<DeviceTag>();
+    private IEnumerable<DeviceTag> TagList { get; set; } = Array.Empty<DeviceTag>();
+
+    private IEnumerable<DevicePropertyValue> Properties = Array.Empty<DevicePropertyValue>();
 
     protected override async Task OnInitializedAsync()
     {
@@ -149,6 +217,8 @@
         }
 
         TagList = await Http.GetFromJsonAsync<List<DeviceTag>>($"/api/settings/device-tags");
+        Properties = await Http.GetFromJsonAsync<List<DevicePropertyValue>>($"{ApiUrlBase}/{DeviceID}/properties");
+
         isLoaded = true;
     }
 
@@ -186,6 +256,10 @@
 
         result.EnsureSuccessStatusCode();
 
+        await Http.PostAsJsonAsync($"{ApiUrlBase}/{DeviceID}/properties", Properties);
+
+        result.EnsureSuccessStatusCode();
+
         // Prompts a snack bar to inform the action was successful
         Snackbar.Add($"Device {Device.DeviceID} has been successfully updated!", Severity.Success);
 
@@ -219,7 +293,7 @@
         DialogService.Show<ConnectionStringDialog>("Device Credentials", parameters);
     }
 
-        private bool CheckTags()
+    private bool CheckTags()
     {
         bool tagValidationError = false;
 
@@ -232,4 +306,4 @@
         }
         return tagValidationError;
     }
-}
\ No newline at end of file
+}
diff --git a/src/AzureIoTHub.Portal/Client/_Imports.razor b/src/AzureIoTHub.Portal/Client/_Imports.razor
index 8396624cd..8541dfdcd 100644
--- a/src/AzureIoTHub.Portal/Client/_Imports.razor
+++ b/src/AzureIoTHub.Portal/Client/_Imports.razor
@@ -9,4 +9,6 @@
 @using Microsoft.JSInterop
 @using AzureIoTHub.Portal.Client
 @using AzureIoTHub.Portal.Client.Shared
+@using AzureIoTHub.Portal.Client.Converters
+@using AzureIoTHub.Portal.Client.Extensions
 @using MudBlazor
diff --git a/src/AzureIoTHub.Portal/Server/Controllers/v1.0/DevicesController.cs b/src/AzureIoTHub.Portal/Server/Controllers/v1.0/DevicesController.cs
index 942dcdc4f..8079dfbff 100644
--- a/src/AzureIoTHub.Portal/Server/Controllers/v1.0/DevicesController.cs
+++ b/src/AzureIoTHub.Portal/Server/Controllers/v1.0/DevicesController.cs
@@ -3,7 +3,9 @@
 
 namespace AzureIoTHub.Portal.Server.Controllers.V10
 {
+    using AzureIoTHub.Portal.Server.Entities;
     using AzureIoTHub.Portal.Server.Factories;
+    using AzureIoTHub.Portal.Server.Helpers;
     using AzureIoTHub.Portal.Server.Managers;
     using AzureIoTHub.Portal.Server.Mappers;
     using AzureIoTHub.Portal.Server.Services;
@@ -12,6 +14,7 @@ namespace AzureIoTHub.Portal.Server.Controllers.V10
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.Extensions.Logging;
     using System.Collections.Generic;
+    using System.Linq;
     using System.Threading.Tasks;
 
     [ApiController]
@@ -20,6 +23,16 @@ namespace AzureIoTHub.Portal.Server.Controllers.V10
     [ApiExplorerSettings(GroupName = "IoT Devices")]
     public class DevicesController : DevicesControllerBase<DeviceListItem, DeviceDetails>
     {
+        /// <summary>
+        /// The table client factory.
+        /// </summary>
+        private readonly ITableClientFactory tableClientFactory;
+
+        /// <summary>
+        /// The devices service.
+        /// </summary>
+        private readonly IDeviceService devicesService;
+
         public DevicesController(
             ILogger<DevicesController> logger,
             IDeviceService devicesService,
@@ -29,7 +42,8 @@ public DevicesController(
             ITableClientFactory tableClientFactory)
             : base(logger, devicesService, deviceTagService, deviceTwinMapper, deviceProvisioningServiceManager, tableClientFactory)
         {
-
+            this.devicesService = devicesService;
+            this.tableClientFactory = tableClientFactory;
         }
 
         /// <summary>
@@ -96,5 +110,102 @@ public override Task<ActionResult<EnrollmentCredentials>> GetCredentials(string
         {
             return base.GetCredentials(deviceID);
         }
+
+        /// <summary>
+        /// Gets the device credentials.
+        /// </summary>
+        /// <param name="deviceID">The device identifier.</param>
+        /// <returns></returns>
+        [HttpGet("{deviceID}/properties", Name = "GET Device Properties")]
+        public async Task<ActionResult<IEnumerable<DevicePropertyValue>>> GetProperties(string deviceID)
+        {
+            var device = await this.devicesService.GetDeviceTwin(deviceID);
+
+            if (device == null)
+            {
+                return this.NotFound();
+            }
+
+            var modelId = DeviceHelper.RetrieveTagValue(device, nameof(DeviceDetails.ModelId));
+
+            if (string.IsNullOrEmpty(modelId))
+            {
+                return this.BadRequest("Device has no modelId tag value");
+            }
+
+            var items = this.tableClientFactory
+                            .GetDeviceTemplateProperties()
+                            .QueryAsync<DeviceModelProperty>($"PartitionKey eq '{modelId}'");
+
+            var result = new List<DevicePropertyValue>();
+
+            await foreach (var item in items)
+            {
+                string value = null;
+
+                if (item.IsWritable && device.Properties.Desired.Contains(item.Name))
+                {
+                    value = device.Properties.Desired[item.Name].ToString();
+                }
+                else if (device.Properties.Reported.Contains(item.Name))
+                {
+                    value = device.Properties.Reported[item.Name].ToString();
+                }
+
+                result.Add(new DevicePropertyValue
+                {
+                    DisplayName = item.DisplayName,
+                    IsWritable = item.IsWritable,
+                    Name = item.Name,
+                    PropertyType = item.PropertyType,
+                    Value = value
+                });
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Gets the device credentials.
+        /// </summary>
+        /// <param name="deviceID">The device identifier.</param>
+        /// <returns></returns>
+        [HttpPost("{deviceID}/properties", Name = "POST Device Properties")]
+        public async Task<ActionResult<IEnumerable<DevicePropertyValue>>> SetProperties(string deviceID, IEnumerable<DevicePropertyValue> values)
+        {
+            var device = await this.devicesService.GetDeviceTwin(deviceID);
+
+            if (device == null)
+            {
+                return this.NotFound();
+            }
+
+            var modelId = DeviceHelper.RetrieveTagValue(device, nameof(DeviceDetails.ModelId));
+
+            if (string.IsNullOrEmpty(modelId))
+            {
+                return this.BadRequest("Device has no modelId tag value");
+            }
+
+            var items = this.tableClientFactory
+                .GetDeviceTemplateProperties()
+                .QueryAsync<DeviceModelProperty>($"PartitionKey eq '{modelId}'");
+
+            var result = new List<DevicePropertyValue>();
+
+            await foreach (var item in items)
+            {
+                if (!item.IsWritable)
+                {
+                    continue;
+                }
+
+                device.Properties.Desired[item.Name] = values.FirstOrDefault(x => x.Name == item.Name)?.Value;
+            }
+
+            _ = await this.devicesService.UpdateDeviceTwin(deviceID, device);
+
+            return this.Ok();
+        }
     }
 }
diff --git a/src/AzureIoTHub.Portal/Server/Entities/DeviceModelProperty.cs b/src/AzureIoTHub.Portal/Server/Entities/DeviceModelProperty.cs
index 2c4a6c7cc..b846ccff3 100644
--- a/src/AzureIoTHub.Portal/Server/Entities/DeviceModelProperty.cs
+++ b/src/AzureIoTHub.Portal/Server/Entities/DeviceModelProperty.cs
@@ -1,4 +1,4 @@
-// Copyright (c) CGI France. All rights reserved.
+// 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.Server.Entities
@@ -24,6 +24,11 @@ public class DeviceModelProperty : EntityBase
         /// </summary>
         public bool IsWritable { get; set; }
 
+        /// <summary>
+        /// The property display order.
+        /// </summary>
+        public int Order { get; set; }
+
         /// <summary>
         /// The device property type
         /// </summary>
diff --git a/src/AzureIoTHub.Portal/Shared/Models/v1.0/Device/DevicePropertyValue.cs b/src/AzureIoTHub.Portal/Shared/Models/v1.0/Device/DevicePropertyValue.cs
new file mode 100644
index 000000000..33f0a5f50
--- /dev/null
+++ b/src/AzureIoTHub.Portal/Shared/Models/v1.0/Device/DevicePropertyValue.cs
@@ -0,0 +1,13 @@
+// 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.Device
+{
+    public class DevicePropertyValue : DeviceProperty
+    {
+        /// <summary>
+        /// The current property value.
+        /// </summary>
+        public string Value { get; set; }
+    }
+}
diff --git a/src/AzureIoTHub.Portal/Shared/Models/v1.0/DeviceProperty.cs b/src/AzureIoTHub.Portal/Shared/Models/v1.0/DeviceProperty.cs
index bade2100e..edc46dc6e 100644
--- a/src/AzureIoTHub.Portal/Shared/Models/v1.0/DeviceProperty.cs
+++ b/src/AzureIoTHub.Portal/Shared/Models/v1.0/DeviceProperty.cs
@@ -27,6 +27,12 @@ public class DeviceProperty
         [Required(ErrorMessage = "The property should indicate whether it's writable or not.")]
         public bool IsWritable { get; set; }
 
+        /// <summary>
+        /// The property display order.
+        /// </summary>
+        [Required(ErrorMessage = "The property should indicate whether it's writable or not.")]
+        public int Order { get; set; }
+
         /// <summary>
         /// The device property type
         /// </summary>