diff --git a/src/Content/Backend/Solution/Monaco.Template.Backend.Api/appsettings.json b/src/Content/Backend/Solution/Monaco.Template.Backend.Api/appsettings.json
index b6b3d86..c5d1a55 100644
--- a/src/Content/Backend/Solution/Monaco.Template.Backend.Api/appsettings.json
+++ b/src/Content/Backend/Solution/Monaco.Template.Backend.Api/appsettings.json
@@ -8,8 +8,8 @@
 	"CorsPolicies": [
 		{
 			"Name": "Default",
-			"Origins": [ "http://localhost:3000" ],
-			"Headers": [ "Authorization" ],
+			"Origins": [ "http://localhost:4200" ],
+			"Headers": [ "Authorization", "Content-Type" ],
 			"Methods": [ "GET", "POST", "PUT", "DELETE", "OPTIONS" ]
 		}
 	],
diff --git a/src/Content/Backend/Solution/Monaco.Template.Backend.Application.Tests/Features/Company/Queries/CompanyQueriesHandlersTests.cs b/src/Content/Backend/Solution/Monaco.Template.Backend.Application.Tests/Features/Company/Queries/CompanyQueriesHandlersTests.cs
index 0fa30ec..a23228a 100644
--- a/src/Content/Backend/Solution/Monaco.Template.Backend.Application.Tests/Features/Company/Queries/CompanyQueriesHandlersTests.cs
+++ b/src/Content/Backend/Solution/Monaco.Template.Backend.Application.Tests/Features/Company/Queries/CompanyQueriesHandlersTests.cs
@@ -33,7 +33,7 @@ public async Task GetCompanyPageWithoutParamsSucceeds(List<Domain.Model.Company>
 
 		result.Should().NotBeNull();
 		result!.Pager.Count.Should().Be(companies.Count);
-		result.Results
+		result.Items
 			  .Should()
 			  .HaveCount(companies.Count).And
 			  .Contain(x => companies.Any(c => c.Name == x.Name)).And
@@ -58,7 +58,7 @@ public async Task GetCompanyPageWithParamsSucceeds(List<Domain.Model.Company> co
 
 		result.Should().NotBeNull();
 		result!.Pager.Count.Should().Be(companiesSet.Count);
-		result.Results
+		result.Items
 			  .Should()
 			  .HaveCount(companiesSet.Count).And
 			  .Contain(x => companiesSet.Any(c => c.Name == x.Name)).And
diff --git a/src/Content/Backend/Solution/Monaco.Template.Backend.Common.Domain.Tests/PageTests.cs b/src/Content/Backend/Solution/Monaco.Template.Backend.Common.Domain.Tests/PageTests.cs
index 2065ccc..d554cb6 100644
--- a/src/Content/Backend/Solution/Monaco.Template.Backend.Common.Domain.Tests/PageTests.cs
+++ b/src/Content/Backend/Solution/Monaco.Template.Backend.Common.Domain.Tests/PageTests.cs
@@ -18,7 +18,7 @@ public void CreateNewPageSucceeds(List<string> results, int offset, int limit, l
 		var sut = new Page<string>(results, offset, limit, count);
 
 		sut.Pager.Should().NotBeNull().And.BeEquivalentTo(new Pager(offset, limit, count));
-		sut.Results.Should().OnlyContain(s => results.Contains(s));
+		sut.Items.Should().OnlyContain(s => results.Contains(s));
 	}
 
 	[Trait("Common Domain Entities", "Pager Entity")]
diff --git a/src/Content/Backend/Solution/Monaco.Template.Backend.Common.Domain/Model/Page.cs b/src/Content/Backend/Solution/Monaco.Template.Backend.Common.Domain/Model/Page.cs
index cf9112a..7da496e 100644
--- a/src/Content/Backend/Solution/Monaco.Template.Backend.Common.Domain/Model/Page.cs
+++ b/src/Content/Backend/Solution/Monaco.Template.Backend.Common.Domain/Model/Page.cs
@@ -4,13 +4,13 @@ public record Page<T>
 {
 	/// <summary>
 	/// </summary>
-	/// <param name="results">Results subset</param>
+	/// <param name="items">Items subset</param>
 	/// <param name="offset">Record from where to start paging</param>
 	/// <param name="limit">Amount of items to page</param>
 	/// <param name="count">Total amount of items</param>
-	public Page(IEnumerable<T> results, int offset, int limit, long count)
+	public Page(IEnumerable<T> items, int offset, int limit, long count)
 	{
-		Results = results.ToList();
+		Items = items.ToList();
 		Pager = new Pager(offset, limit, count);
 	}
 
@@ -19,9 +19,9 @@ public Page(IEnumerable<T> results, int offset, int limit, long count)
 	/// </summary>
 	public Pager Pager { get; }
 	/// <summary>
-	/// Paged results
+	/// Paged items
 	/// </summary>
-	public IReadOnlyList<T> Results { get; }
+	public IReadOnlyList<T> Items { get; }
 }
 
 /// <summary>
diff --git a/src/Content/Backend/Solution/Monaco.Template.Backend.Common.Infrastructure/Context/Extensions/SortingExtensions.cs b/src/Content/Backend/Solution/Monaco.Template.Backend.Common.Infrastructure/Context/Extensions/SortingExtensions.cs
index 6e3c8d1..8ebafd4 100644
--- a/src/Content/Backend/Solution/Monaco.Template.Backend.Common.Infrastructure/Context/Extensions/SortingExtensions.cs
+++ b/src/Content/Backend/Solution/Monaco.Template.Backend.Common.Infrastructure/Context/Extensions/SortingExtensions.cs
@@ -53,40 +53,37 @@ private static IOrderedQueryable<T> GetOrderedQuery<T>(this IQueryable<T> source
 	{
 		var bodyExpression = (MemberExpression)(expression.Body.NodeType == ExpressionType.Convert ? ((UnaryExpression)expression.Body).Operand : expression.Body);
 		var sortLambda = Expression.Lambda(bodyExpression, expression.Parameters);
-		Expression<Func<IOrderedQueryable<T>>> sortMethod;
-		if (firstSort)
-			if (ascending) sortMethod = () => source.OrderBy<T, object>(k => null!);
-			else sortMethod = () => source.OrderByDescending<T, object>(k => null!);
-		else
-			if (ascending) sortMethod = () => ((IOrderedQueryable<T>)source).ThenBy<T, object>(k => null!);
-		else sortMethod = () => ((IOrderedQueryable<T>)source).ThenByDescending<T, object>(k => null!);
+		Expression<Func<IOrderedQueryable<T>>> sortMethod = firstSort
+																? ascending
+																	  ? () => source.OrderBy<T, object>(k => null!)
+																	  : () => source.OrderByDescending<T, object>(k => null!)
+																: ascending
+																	? () => ((IOrderedQueryable<T>)source).ThenBy<T, object>(k => null!)
+																	: () => ((IOrderedQueryable<T>)source).ThenByDescending<T, object>(k => null!);
 
 		var methodCallExpression = (MethodCallExpression)sortMethod.Body;
 		var method = methodCallExpression.Method.GetGenericMethodDefinition();
 		var genericSortMethod = method.MakeGenericMethod(typeof(T), bodyExpression.Type);
-		var orderedQuery = (IOrderedQueryable<T>)genericSortMethod.Invoke(source, new object[] { source, sortLambda })!;
-		return orderedQuery;
+		return (IOrderedQueryable<T>)genericSortMethod.Invoke(source, new object[] { source, sortLambda })!;
 	}
 
 	private static IOrderedEnumerable<T> GetOrderedQuery<T>(this IEnumerable<T> source, Expression<Func<T, object>> expression, bool ascending, bool firstSort)
 	{
 		var bodyExpression = (MemberExpression)(expression.Body.NodeType == ExpressionType.Convert ? ((UnaryExpression)expression.Body).Operand : expression.Body);
 		var sortLambda = Expression.Lambda(bodyExpression, expression.Parameters);
-		Expression<Func<IOrderedEnumerable<T>>> sortMethod;
-		if (firstSort)
-			if (ascending) sortMethod = () => source.OrderBy<T, object>(k => null!);
-			else sortMethod = () => source.OrderByDescending<T, object>(k => null!);
-		else
-			if (ascending) sortMethod = () => ((IOrderedEnumerable<T>)source).ThenBy<T, object>(k => null!);
-		else sortMethod = () => ((IOrderedEnumerable<T>)source).ThenByDescending<T, object>(k => null!);
-
+		Expression<Func<IOrderedEnumerable<T>>> sortMethod = firstSort
+																 ? ascending
+																	   ? () => source.OrderBy<T, object>(k => null!)
+																	   : () => source.OrderByDescending<T, object>(k => null!)
+																 : ascending
+																	 ? () => ((IOrderedEnumerable<T>)source).ThenBy<T, object>(k => null!)
+																	 : () => ((IOrderedEnumerable<T>)source).ThenByDescending<T, object>(k => null!);
 		if (sortMethod.Body is not MethodCallExpression methodCallExpression)
 			throw new Exception("oops");
 
 		var meth = methodCallExpression.Method.GetGenericMethodDefinition();
 		var genericSortMethod = meth.MakeGenericMethod(typeof(T), bodyExpression.Type);
-		var orderedQuery = (IOrderedEnumerable<T>)genericSortMethod.Invoke(source, new object[] { source, sortLambda.Compile() })!;
-		return orderedQuery;
+		return (IOrderedEnumerable<T>)genericSortMethod.Invoke(source, new object[] { source, sortLambda.Compile() })!;
 	}
 
 	private static Dictionary<string, bool> ProcessSortParam<T>(IEnumerable<string?> sortFields,
diff --git a/src/Monaco.Template.nuspec b/src/Monaco.Template.nuspec
index 389fd9e..7762d4b 100644
--- a/src/Monaco.Template.nuspec
+++ b/src/Monaco.Template.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
 	<metadata>
 		<id>Monaco.Template</id>
-		<version>2.0.4</version>
+		<version>2.1.0</version>
 		<title>Monaco Template</title>
 		<description>
 			Templates for .NET projects