diff --git a/samples/demos/belgrade-product-catalog-demo/Controllers/CompanyController.cs b/samples/demos/belgrade-product-catalog-demo/Controllers/CompanyController.cs
index b79ee644..84003f3f 100644
--- a/samples/demos/belgrade-product-catalog-demo/Controllers/CompanyController.cs
+++ b/samples/demos/belgrade-product-catalog-demo/Controllers/CompanyController.cs
@@ -38,6 +38,7 @@ namespace ProductCatalog.Controllers
                 case "index": referer = "/index.html"; break;
                 case "report1": referer = "/report-pie.html"; break;
                 case "report2": referer = "/report-multibar.html"; break;
+                case "dashboard": referer = "/dashboard.html"; break;
                 case "temporal": referer = "/temporal.html"; break;
                 default: referer = "/index.html"; break;
             }
diff --git a/samples/demos/belgrade-product-catalog-demo/ProductCatalog.xproj b/samples/demos/belgrade-product-catalog-demo/ProductCatalog.xproj
index bddc4a1d..d6cd6870 100644
--- a/samples/demos/belgrade-product-catalog-demo/ProductCatalog.xproj
+++ b/samples/demos/belgrade-product-catalog-demo/ProductCatalog.xproj
@@ -7,7 +7,7 @@
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>7e230e5a-b0b6-4f56-9561-942fd1817b80</ProjectGuid>
-    <RootNamespace>product_catalog</RootNamespace>
+    <RootNamespace>ProductCatalog</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
diff --git a/samples/demos/belgrade-product-catalog-demo/Views/ProductCatalog/Index.cshtml b/samples/demos/belgrade-product-catalog-demo/Views/ProductCatalog/Index.cshtml
index 47d6b9c3..aeb38ab5 100644
--- a/samples/demos/belgrade-product-catalog-demo/Views/ProductCatalog/Index.cshtml
+++ b/samples/demos/belgrade-product-catalog-demo/Views/ProductCatalog/Index.cshtml
@@ -90,8 +90,8 @@
                     <td>@product.Color</td>
                     <td>@product.Price</td>
                     <td>@product.Quantity</td>
-                    <td>@product.Data.MadeIn</td>
-                    <td>@(product.Tags==null?string.Empty:string.Join(", ", product.Tags))</td>
+                    <td>@(product.Data == null ? string.Empty : product.Data.MadeIn)</td>
+                    <td>@(product.Tags==null ? string.Empty : string.Join(", ", product.Tags))</td>
                 </tr>
             }
         </tbody>
diff --git a/samples/demos/belgrade-product-catalog-demo/Views/Shared/_Layout.cshtml b/samples/demos/belgrade-product-catalog-demo/Views/Shared/_Layout.cshtml
index 84beae84..1a9ba475 100644
--- a/samples/demos/belgrade-product-catalog-demo/Views/Shared/_Layout.cshtml
+++ b/samples/demos/belgrade-product-catalog-demo/Views/Shared/_Layout.cshtml
@@ -27,8 +27,6 @@
             <div id="navbar" class="navbar-collapse collapse">
                 <ul class="nav navbar-nav">
                     <li class="index"><a href="~/ProductCatalog/Index">Product list</a></li>
-                    <li class="report1"><a href="~/ProductCatalog/Report1">Products by color</a></li>
-                    <li class="report2"><a href="~/ProductCatalog/Report2">Quantity by company/color</a></li>
                 </ul>
                 <ul class="nav navbar-nav pull-right">
                     <li class="dropdown pull-right">
diff --git a/samples/demos/belgrade-product-catalog-demo/sql-scripts/1 setup.sql b/samples/demos/belgrade-product-catalog-demo/sql-scripts/1 setup.sql
index 9a3f64b6..e34b7e97 100644
--- a/samples/demos/belgrade-product-catalog-demo/sql-scripts/1 setup.sql	
+++ b/samples/demos/belgrade-product-catalog-demo/sql-scripts/1 setup.sql	
@@ -35,7 +35,7 @@ CREATE TABLE Product (
 GO
 
 DECLARE @products NVARCHAR(MAX) = 
-N'[{"ProductID":15,"Name":"Adjustable Race","Color":"Magenta","Size":"62","Price":100.0000,"Quantity":75,"CompanyID":1,"Data":{"Type":"Part","MadeIn":"China"},"DateModified":"2016-02-11T21:27:32"},{"ProductID":16,"Name":"Bearing Ball","Color":"Magenta","Size":"62","Price":15.9900,"Quantity":90,"CompanyID":2,"Data":{"ManufacturingCost":11.672700,"Type":"Part","MadeIn":"China"},"Tags":["promo"],"DateModified":"2016-02-11T21:27:32"},{"ProductID":17,"Name":"BB Ball Bearing","Color":"Magenta","Size":"62","Price":28.9900,"Quantity":80,"CompanyID":3,"Data":{"ManufacturingCost":21.162700,"Type":"Part","MadeIn":"China"},"DateModified":"2016-02-11T21:27:32"},{"ProductID":18,"Name":"Blade","Color":"Magenta","Size":"62","Price":18.0000,"Quantity":45,"CompanyID":4,"Data":{},"Tags":["new"],"DateModified":"2016-02-11T21:27:32"},{"ProductID":19,"Name":"Sport-100 Helmet, Red","Color":"Black","Size":"72","Price":41.9900,"Quantity":38,"CompanyID":3,"Data":{"ManufacturingCost":30.652700,"Type":"Еquipment","MadeIn":"China"},"Tags":["promo"],"DateModified":"2016-02-11T21:27:32"},{"ProductID":20,"Name":"Sport-100 Helmet, Black","Color":"Black","Size":"72","Price":31.4900,"Quantity":60,"CompanyID":1,"Data":{"ManufacturingCost":22.987700,"Type":"Еquipment","MadeIn":"China"},"Tags":["new","promo"],"DateModified":"2016-02-11T21:27:32"},{"ProductID":21,"Name":"Mountain Bike Socks, M","Color":"White","Size":"M","Price":560.9900,"Quantity":30,"CompanyID":2,"Data":{"Type":"Clothes"},"Tags":["sales","promo"],"DateModified":"2016-02-11T21:27:32"},{"ProductID":22,"Name":"Mountain Bike Socks, L","Color":"White","Size":"L","Price":120.9900,"Quantity":20,"CompanyID":3,"Data":{"ManufacturingCost":88.322700,"Type":"Clothes"},"Tags":["sales","promo"],"DateModified":"2016-02-11T21:27:32"},{"ProductID":23,"Name":"Long-Sleeve Logo Jersey, XL","Color":"Multi","Size":"XL","Price":44.9900,"Quantity":60,"CompanyID":1,"Data":{"ManufacturingCost":32.842700,"Type":"Clothes"},"Tags":["sales","promo"],"DateModified":"2016-02-11T21:27:32"},{"ProductID":24,"Name":"Road-650 Black, 52","Color":"Black","Size":"52","Price":704.6900,"Quantity":70,"CompanyID":5,"Data":{"Type":"Bike","MadeIn":"UK"},"DateModified":"2016-02-11T21:27:32"},{"ProductID":25,"Name":"Mountain-100 Silver, 38","Color":"White","Size":"38","Price":359.9900,"Quantity":45,"CompanyID":1,"Data":{"ManufacturingCost":262.792700,"Type":"Bike","MadeIn":"UK"},"Tags":["promo"],"DateModified":"2016-02-11T21:27:32"},{"ProductID":26,"Name":"Road-250 Black, 48","Color":"Black","Size":"48","Price":299.0200,"Quantity":25,"CompanyID":2,"Data":{"ManufacturingCost":218.284600,"Type":"Bike","MadeIn":"UK"},"Tags":["new","promo"],"DateModified":"2016-02-11T21:27:32"},{"ProductID":27,"Name":"ML Bottom Bracket","Price":101.2400,"Quantity":50,"CompanyID":3,"Data":{"Type":"Part","MadeIn":"China"},"DateModified":"2016-02-11T21:27:32"},{"ProductID":28,"Name":"HL Bottom Bracket","Price":121.4900,"Quantity":65,"CompanyID":4,"Data":{"ManufacturingCost":88.687700,"Type":"Part","MadeIn":"China"},"DateModified":"2016-02-11T21:27:32"}]'
+N'[{"ProductID":15,"Name":"Adjustable Race","Color":"Magenta","Size":"62","Price":100.0000,"Quantity":75,"CompanyID":1,"Data":{"Type":"Part","MadeIn":"China"},"DateModified":"2016-02-11T21:27:32"},{"ProductID":16,"Name":"Bearing Ball","Color":"Magenta","Size":"62","Price":15.9900,"Quantity":90,"CompanyID":2,"Data":{"ManufacturingCost":11.672700,"Type":"Part","MadeIn":"China"},"Tags":["promo"],"DateModified":"2016-02-11T21:27:32"},{"ProductID":17,"Name":"BB Ball Bearing","Color":"Magenta","Size":"62","Price":28.9900,"Quantity":80,"CompanyID":3,"Data":{"ManufacturingCost":21.162700,"Type":"Part","MadeIn":"China"},"DateModified":"2016-02-11T21:27:32"},{"ProductID":18,"Name":"Blade","Color":"Silver","Size":"62","Price":18.0000,"Quantity":45,"CompanyID":1,"Data":{},"Tags":["new"],"DateModified":"2016-02-11T21:27:32"},{"ProductID":19,"Name":"Sport-100 Helmet, Red","Color":"Black","Size":"72","Price":41.9900,"Quantity":38,"CompanyID":3,"Data":{"ManufacturingCost":30.652700,"Type":"Еquipment","MadeIn":"China"},"Tags":["promo"],"DateModified":"2016-02-11T21:27:32"},{"ProductID":20,"Name":"Sport-100 Helmet, Black","Color":"Black","Size":"72","Price":31.4900,"Quantity":60,"CompanyID":1,"Data":{"ManufacturingCost":22.987700,"Type":"Еquipment","MadeIn":"China"},"Tags":["new","promo"],"DateModified":"2016-02-11T21:27:32"},{"ProductID":21,"Name":"Mountain Bike Socks, M","Color":"White","Size":"M","Price":560.9900,"Quantity":30,"CompanyID":2,"Data":{"Type":"Clothes"},"Tags":["sales","promo"],"DateModified":"2016-02-11T21:27:32"},{"ProductID":22,"Name":"Mountain Bike Socks, L","Color":"White","Size":"L","Price":120.9900,"Quantity":20,"CompanyID":3,"Data":{"ManufacturingCost":88.322700,"Type":"Clothes"},"Tags":["sales","promo"],"DateModified":"2016-02-11T21:27:32"},{"ProductID":23,"Name":"Long-Sleeve Logo Jersey, XL","Color":"White","Size":"XL","Price":44.9900,"Quantity":60,"CompanyID":1,"Data":{"ManufacturingCost":32.842700,"Type":"Clothes"},"Tags":["sales","promo"],"DateModified":"2016-02-11T21:27:32"},{"ProductID":24,"Name":"Road-650 Black, 52","Color":"Black","Size":"52","Price":704.6900,"Quantity":70,"CompanyID":1,"Data":{"Type":"Bike","MadeIn":"UK"},"DateModified":"2016-02-11T21:27:32"},{"ProductID":25,"Name":"Mountain-100 Silver, 38","Color":"White","Size":"38","Price":359.9900,"Quantity":45,"CompanyID":1,"Data":{"ManufacturingCost":262.792700,"Type":"Bike","MadeIn":"UK"},"Tags":["promo"],"DateModified":"2016-02-11T21:27:32"},{"ProductID":26,"Name":"Road-250 Black, 48","Color":"Black","Size":"48","Price":299.0200,"Quantity":25,"CompanyID":2,"Data":{"ManufacturingCost":218.284600,"Type":"Bike","MadeIn":"UK"},"Tags":["new","promo"],"DateModified":"2016-02-11T21:27:32"},{"ProductID":27,"Name":"ML Bottom Bracket","Color":"Silver","Size":"36","Price":101.2400,"Quantity":50,"CompanyID":3,"Data":{"Type":"Part","MadeIn":"China"},"DateModified":"2016-02-11T21:27:32"},{"ProductID":28,"Name":"HL Bottom Bracket","Color":"Silver","Size":"36","Price":121.4900,"Quantity":65,"CompanyID":2,"Data":{"ManufacturingCost":88.687700,"Type":"Part","MadeIn":"China"},"DateModified":"2016-02-11T21:27:32"}]'
 INSERT INTO Product (ProductID, Name, Color, Size, Price, Quantity, CompanyID, Data, Tags, DateModified)
 SELECT ProductID, Name, Color, Size, Price, Quantity, CompanyID, Data, Tags, DateModified
 FROM OPENJSON (@products) WITH(
@@ -53,6 +53,7 @@ CREATE TABLE Company (
 	CompanyID int PRIMARY KEY DEFAULT (NEXT VALUE FOR CompanyId),
 	Name nvarchar(50) NOT NULL,
 	Address nvarchar(100) NULL,
+	Contact nvarchar(100) NULL,
 	Email nvarchar(50) NULL,
 	Phone nvarchar(50) NULL,
 	Postcode nvarchar(20) NULL,
@@ -60,11 +61,11 @@ CREATE TABLE Company (
 GO
 
 declare @companies nvarchar(max) = 
-N'[{"CompanyID":1,"Name":"A Datum Corporation","Email":"msavic@datum.com","Address":"Suite 10, 183838 Southwest Boulevard, Surrey","Phone":"(381) 555-7639","Postcode":"46077"},{"CompanyID":2,"Name":"Contoso, Ltd.","Email":"zmisic@contoso.com","Address":"Unit 2, 2934 Night Road, Jolimont","Phone":"(360) 555-4901","Postcode":"98253"},{"CompanyID":3,"Name":"Consolidated Messenger","Email":"rputnik@consolidated-messanger.com","Address":"894 Market Day Street, West Mont","Phone":"(415) 555-1105","Postcode":"94101"}]'
-INSERT INTO Company (CompanyID, Name, Address, Email, Phone, Postcode)
-SELECT CompanyID, Name, Address, Email, Phone, Postcode
+N'[{"CompanyID":1,"Name":"A Datum Corporation","Email":"msavic@datum.com","Address":"Suite 10, 183838 Southwest Boulevard, Surrey","Contact":"Milunka Savic","Phone":"(381) 555-7639","Postcode":"46077"},{"CompanyID":2,"Name":"Contoso, Ltd.","Email":"zmisic@contoso.com","Address":"Unit 2, 2934 Night Road, Jolimont","Contact":"Zivojin Misic","Phone":"(360) 555-4901","Postcode":"98253"},{"CompanyID":3,"Name":"Consolidated Messenger","Contact":"Radomir Putnik","Email":"rputnik@consolidated-messanger.com","Address":"894 Market Day Street, West Mont","Phone":"(415) 555-1105","Postcode":"94101"}]'
+INSERT INTO Company (CompanyID, Name, Address, Email, Phone, Postcode, Contact)
+SELECT CompanyID, Name, Address, Email, Phone, Postcode, Contact
 FROM OPENJSON (@companies)
-	WITH(CompanyID int, Name nvarchar(50), Address nvarchar(100), Email nvarchar(50), Phone nvarchar(50), Postcode nvarchar(20))
+	WITH(CompanyID int, Name nvarchar(50), Address nvarchar(100), Email nvarchar(50), Phone nvarchar(50), Postcode nvarchar(20),Contact nvarchar(100))
 GO
 
 DROP PROCEDURE IF EXISTS [dbo].[InsertProductFromJson]
@@ -112,7 +113,8 @@ AS BEGIN
 
 END
 GO
-
+DROP TABLE IF EXISTS Logs;
+GO
 CREATE TABLE Logs (
    Id int IDENTITY PRIMARY KEY,
    Message nvarchar(max) NULL,
diff --git a/samples/demos/belgrade-product-catalog-demo/sql-scripts/3 setup-temporal.sql b/samples/demos/belgrade-product-catalog-demo/sql-scripts/3 setup-temporal.sql
index 7e545a2c..917013a5 100644
--- a/samples/demos/belgrade-product-catalog-demo/sql-scripts/3 setup-temporal.sql	
+++ b/samples/demos/belgrade-product-catalog-demo/sql-scripts/3 setup-temporal.sql	
@@ -21,7 +21,7 @@ CREATE TABLE History.Product(
 
 
 DECLARE @products NVARCHAR(MAX) =
-N'[{"ProductID":15,"Name":"Adjustable Race","Price":75.9900,"Quantity":50,"CompanyID":1,"Data":{"Type":"Part","MadeIn":"China"},"DateModified":"2015-05-07T03:39:52","ValidTo":"2015-08-07T03:40:01"},{"ProductID":16,"Name":"Bearing Ball","Price":35.9900,"Quantity":80,"CompanyID":2,"Data":{"ManufacturingCost":11.672700,"Type":"Part","MadeIn":"China"},"Tags":["promo"],"DateModified":"2015-05-07T03:39:52","ValidTo":"2015-08-07T03:40:01"},{"ProductID":17,"Name":"BB Ball Bearing","Price":75.0000,"Quantity":20,"CompanyID":3,"Data":{"ManufacturingCost":21.162700,"Type":"Part","MadeIn":"China"},"DateModified":"2015-05-07T03:39:52","ValidTo":"2015-08-07T03:40:01"},{"ProductID":18,"Name":"Blade","Color":"Silver","Price":20.9900,"Quantity":70,"CompanyID":4,"Data":{},"Tags":["new"],"DateModified":"2015-05-07T03:40:01","ValidTo":"2015-08-07T03:40:01"},{"ProductID":15,"Name":"Adjustable Race","Color":"Magenta","Size":"62","Price":89.9900,"Quantity":80,"CompanyID":1,"Data":{"Type":"Part","MadeIn":"China"},"DateModified":"2015-08-07T03:40:01","ValidTo":"2015-11-07T03:40:09"},{"ProductID":16,"Name":"Bearing Ball","Color":"Blue","Size":"62","Price":15.9900,"Quantity":120,"CompanyID":2,"Data":{"ManufacturingCost":11.672700,"Type":"Part","MadeIn":"China"},"Tags":["promo"],"DateModified":"2015-08-07T03:40:01","ValidTo":"2015-11-07T03:40:09"},{"ProductID":17,"Name":"BB Ball Bearing","Color":"Magenta","Size":"62","Price":25.1900,"Quantity":65,"CompanyID":3,"Data":{"ManufacturingCost":21.162700,"Type":"Part","MadeIn":"China"},"DateModified":"2015-08-07T03:40:01","ValidTo":"2015-11-07T03:40:09"},{"ProductID":18,"Name":"Blade","Color":"Silver","Size":"62","Price":20.9900,"Quantity":80,"CompanyID":4,"Data":{},"Tags":["new"],"DateModified":"2015-08-07T03:40:01","ValidTo":"2015-11-07T03:40:09"},{"ProductID":18,"Name":"Blade","Color":"Silver","Size":"62","Price":20.1500,"Quantity":95,"CompanyID":4,"Data":{},"Tags":["new"],"DateModified":"2015-11-07T03:40:09","ValidTo":"2016-02-07T03:40:15"},{"ProductID":17,"Name":"BB Ball Bearing","Color":"Magenta","Size":"62","Price":37.9900,"Quantity":90,"CompanyID":3,"Data":{"ManufacturingCost":21.162700,"Type":"Part","MadeIn":"China"},"DateModified":"2015-11-07T03:40:09","ValidTo":"2016-02-07T03:40:15"},{"ProductID":16,"Name":"Bearing Ball","Color":"Blue","Size":"62","Price":0,"Quantity":110,"CompanyID":2,"Data":{"ManufacturingCost":11.672700,"Type":"Part","MadeIn":"China"},"Tags":["promo"],"DateModified":"2015-11-07T03:40:09","ValidTo":"2016-02-07T03:40:15"},{"ProductID":15,"Name":"Adjustable Race","Color":"Magenta","Size":"62","Price":105.9900,"Quantity":100,"CompanyID":1,"Data":{"Type":"Part","MadeIn":"China"},"DateModified":"2015-11-07T03:40:09","ValidTo":"2016-02-07T03:40:15"},{"ProductID":26,"Name":"Road-250 Black, 48","Color":"Black","Size":"48","Price":1250.9900,"Quantity":90,"CompanyID":2,"Data":{"ManufacturingCost":218.284600,"Type":"Bike","MadeIn":"UK"},"Tags":["new","promo"],"DateModified":"2015-12-28T03:40:15","ValidTo":"2016-02-07T03:40:15"},{"ProductID":25,"Name":"Mountain-100 Silver, 38","Color":"Silver","Size":"38","Price":799.9900,"Quantity":90,"CompanyID":1,"Data":{"ManufacturingCost":262.792700,"Type":"Bike","MadeIn":"UK"},"Tags":["promo"],"DateModified":"2015-12-28T03:40:15","ValidTo":"2016-02-07T03:40:15"},{"ProductID":24,"Name":"Road-650 Black, 52","Color":"Black","Size":"52","Price":529.9900,"Quantity":90,"CompanyID":5,"Data":{"Type":"Bike","MadeIn":"UK"},"DateModified":"2015-12-28T03:40:15","ValidTo":"2016-02-07T03:40:15"},{"ProductID":23,"Name":"Long-Sleeve Logo Jersey, XL","Color":"Multi","Size":"XL","Price":49.9900,"Quantity":90,"CompanyID":4,"Data":{"ManufacturingCost":32.842700,"Type":"Clothes"},"Tags":["sales","promo"],"DateModified":"2015-12-28T03:40:15","ValidTo":"2016-02-07T03:40:15"},{"ProductID":22,"Name":"Mountain Bike Socks, L","Color":"White","Size":"L","Price":19.9900,"Quantity":90,"CompanyID":3,"Data":{"ManufacturingCost":88.322700,"Type":"Clothes"},"Tags":["sales","promo"],"DateModified":"2015-12-28T03:40:15","ValidTo":"2016-02-07T03:40:15"},{"ProductID":21,"Name":"Mountain Bike Socks, M","Color":"White","Size":"M","Price":9.5000,"Quantity":90,"CompanyID":2,"Data":{"Type":"Clothes"},"Tags":["sales","promo"],"DateModified":"2015-12-28T03:40:15","ValidTo":"2016-02-07T03:40:15"},{"ProductID":20,"Name":"Sport-100 Helmet, Black","Color":"Black","Price":45.9900,"Quantity":10,"CompanyID":1,"Data":{"ManufacturingCost":22.987700,"Type":"Еquipment","MadeIn":"China"},"Tags":["new","promo"],"DateModified":"2015-12-28T03:40:15","ValidTo":"2016-02-07T03:40:15"},{"ProductID":19,"Name":"Sport-100 Helmet, Red","Color":"Red","Price":34.9900,"Quantity":10,"CompanyID":3,"Data":{"ManufacturingCost":30.652700,"Type":"Еquipment","MadeIn":"China"},"Tags":["promo"],"DateModified":"2015-12-28T03:40:15","ValidTo":"2016-02-07T03:40:15"},{"ProductID":15,"Name":"Adjustable Race","Color":"Magenta","Size":"62","Price":32.9900,"Quantity":75,"CompanyID":1,"Data":{"Type":"Part","MadeIn":"China"},"DateModified":"2016-02-10T21:19:20","ValidTo":"2016-02-11T21:15:48"},{"ProductID":15,"Name":"Adjustable Race","Color":"Magenta","Size":"62","Price":100.0000,"Quantity":75,"CompanyID":1,"Data":{"Type":"Part","MadeIn":"China"},"DateModified":"2016-02-11T21:15:48","ValidTo":"2016-02-11T21:24:12"},{"ProductID":15,"Name":"Adjustable Race","Color":"Magenta","Size":"62","Price":120.0000,"Quantity":75,"CompanyID":1,"Data":{"Type":"Part","MadeIn":"China"},"DateModified":"2016-02-11T21:24:12","ValidTo":"2016-02-11T21:27:32"}]';
+N'[{"ProductID":15,"Name":"Adjustable Race","Price":75.9900,"Quantity":50,"CompanyID":1,"Data":{"Type":"Part","MadeIn":"China"},"DateModified":"2015-05-07T03:39:52","ValidTo":"2015-08-07T03:40:01"},{"ProductID":16,"Name":"Bearing Ball","Price":35.9900,"Quantity":80,"CompanyID":2,"Data":{"ManufacturingCost":11.672700,"Type":"Part","MadeIn":"China"},"Tags":["promo"],"DateModified":"2015-05-07T03:39:52","ValidTo":"2015-08-07T03:40:01"},{"ProductID":17,"Name":"BB Ball Bearing","Price":75.0000,"Quantity":20,"CompanyID":3,"Data":{"ManufacturingCost":21.162700,"Type":"Part","MadeIn":"China"},"DateModified":"2015-05-07T03:39:52","ValidTo":"2015-08-07T03:40:01"},{"ProductID":18,"Name":"Blade","Color":"Silver","Price":20.9900,"Quantity":70,"CompanyID":1,"Data":{},"Tags":["new"],"DateModified":"2015-05-07T03:40:01","ValidTo":"2015-08-07T03:40:01"},{"ProductID":15,"Name":"Adjustable Race","Color":"Magenta","Size":"62","Price":89.9900,"Quantity":80,"CompanyID":1,"Data":{"Type":"Part","MadeIn":"China"},"DateModified":"2015-08-07T03:40:01","ValidTo":"2015-11-07T03:40:09"},{"ProductID":16,"Name":"Bearing Ball","Color":"Blue","Size":"62","Price":15.9900,"Quantity":120,"CompanyID":2,"Data":{"ManufacturingCost":11.672700,"Type":"Part","MadeIn":"China"},"Tags":["promo"],"DateModified":"2015-08-07T03:40:01","ValidTo":"2015-11-07T03:40:09"},{"ProductID":17,"Name":"BB Ball Bearing","Color":"Magenta","Size":"62","Price":25.1900,"Quantity":65,"CompanyID":3,"Data":{"ManufacturingCost":21.162700,"Type":"Part","MadeIn":"China"},"DateModified":"2015-08-07T03:40:01","ValidTo":"2015-11-07T03:40:09"},{"ProductID":18,"Name":"Blade","Color":"Silver","Size":"62","Price":20.9900,"Quantity":80,"CompanyID":1,"Data":{},"Tags":["new"],"DateModified":"2015-08-07T03:40:01","ValidTo":"2015-11-07T03:40:09"},{"ProductID":18,"Name":"Blade","Color":"Silver","Size":"62","Price":20.1500,"Quantity":95,"CompanyID":1,"Data":{},"Tags":["new"],"DateModified":"2015-11-07T03:40:09","ValidTo":"2016-02-07T03:40:15"},{"ProductID":17,"Name":"BB Ball Bearing","Color":"Magenta","Size":"62","Price":37.9900,"Quantity":90,"CompanyID":3,"Data":{"ManufacturingCost":21.162700,"Type":"Part","MadeIn":"China"},"DateModified":"2015-11-07T03:40:09","ValidTo":"2016-02-07T03:40:15"},{"ProductID":16,"Name":"Bearing Ball","Color":"Blue","Size":"62","Price":0.0000,"Quantity":110,"CompanyID":2,"Data":{"ManufacturingCost":11.672700,"Type":"Part","MadeIn":"China"},"Tags":["promo"],"DateModified":"2015-11-07T03:40:09","ValidTo":"2016-02-07T03:40:15"},{"ProductID":15,"Name":"Adjustable Race","Color":"Magenta","Size":"62","Price":105.9900,"Quantity":100,"CompanyID":1,"Data":{"Type":"Part","MadeIn":"China"},"DateModified":"2015-11-07T03:40:09","ValidTo":"2016-02-07T03:40:15"},{"ProductID":26,"Name":"Road-250 Black, 48","Color":"Black","Size":"48","Price":1250.9900,"Quantity":90,"CompanyID":2,"Data":{"ManufacturingCost":218.284600,"Type":"Bike","MadeIn":"UK"},"Tags":["new","promo"],"DateModified":"2015-12-28T03:40:15","ValidTo":"2016-02-07T03:40:15"},{"ProductID":25,"Name":"Mountain-100 Silver, 38","Color":"Silver","Size":"38","Price":799.9900,"Quantity":90,"CompanyID":1,"Data":{"ManufacturingCost":262.792700,"Type":"Bike","MadeIn":"UK"},"Tags":["promo"],"DateModified":"2015-12-28T03:40:15","ValidTo":"2016-02-07T03:40:15"},{"ProductID":24,"Name":"Road-650 Black, 52","Color":"Black","Size":"52","Price":529.9900,"Quantity":90,"CompanyID":1,"Data":{"Type":"Bike","MadeIn":"UK"},"DateModified":"2015-12-28T03:40:15","ValidTo":"2016-02-07T03:40:15"},{"ProductID":23,"Name":"Long-Sleeve Logo Jersey, XL","Color":"Multi","Size":"XL","Price":49.9900,"Quantity":90,"CompanyID":1,"Data":{"ManufacturingCost":32.842700,"Type":"Clothes"},"Tags":["sales","promo"],"DateModified":"2015-12-28T03:40:15","ValidTo":"2016-02-07T03:40:15"},{"ProductID":22,"Name":"Mountain Bike Socks, L","Color":"White","Size":"L","Price":19.9900,"Quantity":90,"CompanyID":3,"Data":{"ManufacturingCost":88.322700,"Type":"Clothes"},"Tags":["sales","promo"],"DateModified":"2015-12-28T03:40:15","ValidTo":"2016-02-07T03:40:15"},{"ProductID":21,"Name":"Mountain Bike Socks, M","Color":"White","Size":"M","Price":9.5000,"Quantity":90,"CompanyID":2,"Data":{"Type":"Clothes"},"Tags":["sales","promo"],"DateModified":"2015-12-28T03:40:15","ValidTo":"2016-02-07T03:40:15"},{"ProductID":20,"Name":"Sport-100 Helmet, Black","Color":"Black","Price":45.9900,"Quantity":10,"CompanyID":1,"Data":{"ManufacturingCost":22.987700,"Type":"Еquipment","MadeIn":"China"},"Tags":["new","promo"],"DateModified":"2015-12-28T03:40:15","ValidTo":"2016-02-07T03:40:15"},{"ProductID":19,"Name":"Sport-100 Helmet, Red","Color":"Red","Price":34.9900,"Quantity":10,"CompanyID":3,"Data":{"ManufacturingCost":30.652700,"Type":"Еquipment","MadeIn":"China"},"Tags":["promo"],"DateModified":"2015-12-28T03:40:15","ValidTo":"2016-02-07T03:40:15"},{"ProductID":15,"Name":"Adjustable Race","Color":"Magenta","Size":"62","Price":32.9900,"Quantity":75,"CompanyID":1,"Data":{"Type":"Part","MadeIn":"China"},"DateModified":"2016-02-10T21:19:20","ValidTo":"2016-02-11T21:15:48"},{"ProductID":15,"Name":"Adjustable Race","Color":"Magenta","Size":"62","Price":100.0000,"Quantity":75,"CompanyID":1,"Data":{"Type":"Part","MadeIn":"China"},"DateModified":"2016-02-11T21:15:48","ValidTo":"2016-02-11T21:24:12"},{"ProductID":15,"Name":"Adjustable Race","Color":"Magenta","Size":"62","Price":120.0000,"Quantity":75,"CompanyID":1,"Data":{"Type":"Part","MadeIn":"China"},"DateModified":"2016-02-11T21:24:12","ValidTo":"2016-02-11T21:27:32"}]';
 INSERT INTO History.Product(ProductID, Name, Color, Size, Price, Quantity, CompanyID, Data, Tags, DateModified, ValidTo)
 SELECT ProductID, Name, Color, Size, Price, Quantity, CompanyID, Data, Tags, DateModified, ValidTo
 FROM OPENJSON (@products) WITH(
diff --git a/samples/demos/belgrade-product-catalog-demo/wwwroot/dashboard.html b/samples/demos/belgrade-product-catalog-demo/wwwroot/dashboard.html
new file mode 100644
index 00000000..211b731f
--- /dev/null
+++ b/samples/demos/belgrade-product-catalog-demo/wwwroot/dashboard.html
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <link href="media/css/Bootstrap.css" rel="stylesheet" />
+    <link href="media/js/lib/nvd3/nv.d3.min.css" rel="stylesheet" />
+    <script src="media/js/lib/jquery.js"></script>
+    <script src="media/js/lib/jquery.html-template.js"></script>
+    <script src="media/js/lib/nvd3/d3.min.js"></script>
+    <script src="media/js/lib/nvd3/nv.d3.min.js"></script>
+    <script src="media/js/lib/Bootstrap.js"></script>
+    <script src="media/js/rls.js"></script>
+    <script src="media/js/dashboard.js"></script>
+    
+</head>
+<body>
+    <!-- Static navbar -->
+    <nav class="navbar navbar-default">
+        <div class="container-fluid">
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+                    <span class="sr-only">Toggle navigation</span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+                <a class="navbar-brand" href="/ProductCatalog/Index">Product Catalog Demo</a>
+            </div>
+            <div id="navbar" class="navbar-collapse collapse">
+                <ul class="nav navbar-nav">
+                    <li><a href="index.html">Product List</a></li>
+                    <li class="active"><a href="#">Dashboard</a></li>
+                    <li><a href="temporal.html">Product History</a></li>
+                </ul>
+                <ul class="nav navbar-nav pull-right">
+                    <li class="dropdown pull-right">
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Current user: <span class="UserGreeting">Admin</span><span class="caret"></span></a>
+                        <ul class="dropdown-menu">
+                            <li><a href="/api/Company/login?id=0&page=dashboard" class="user-role">Admin</a></li>
+                            <li><a href="/api/Company/login?id=1&page=dashboard" class="user-role">A Datum Corporation</a></li>
+                            <li><a href="/api/Company/login?id=2&page=dashboard" class="user-role">Contoso, Ltd.</a></li>
+                            <li><a href="/api/Company/login?id=3&page=dashboard" class="user-role">Consolidated Messenger</a></li>
+                        </ul>
+                    </li>
+                </ul>
+            </div><!--/.nav-collapse -->
+        </div><!--/.container-fluid -->
+    </nav>
+    <!-- End Static navbar -->
+
+    <div class="container-fluid">
+        <div class="row">
+            <div class="col-xs-3">
+                <svg id="pie1"></svg>
+            </div>
+            <div class="col-xs-3">
+                <svg id="pie2"></svg>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-xs-12">
+                <svg id="chart1"></svg>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/samples/demos/belgrade-product-catalog-demo/wwwroot/index.html b/samples/demos/belgrade-product-catalog-demo/wwwroot/index.html
index 658d8f38..2c75825a 100644
--- a/samples/demos/belgrade-product-catalog-demo/wwwroot/index.html
+++ b/samples/demos/belgrade-product-catalog-demo/wwwroot/index.html
@@ -43,8 +43,7 @@
             <div id="navbar" class="navbar-collapse collapse">
                 <ul class="nav navbar-nav">
                     <li class="active"><a href="#">Product List</a></li>
-                    <li><a href="report-pie.html">Products by color</a></li>
-                    <li><a href="report-multibar.html">Quantity by company/color</a></li>
+                    <li><a href="dashboard.html">Dashboard</a></li>
                     <li><a href="temporal.html">Product History</a></li>
                 </ul>
                 <ul class="nav navbar-nav pull-right">
diff --git a/samples/demos/belgrade-product-catalog-demo/wwwroot/media/js/dashboard.js b/samples/demos/belgrade-product-catalog-demo/wwwroot/media/js/dashboard.js
new file mode 100644
index 00000000..f40e3a5c
--- /dev/null
+++ b/samples/demos/belgrade-product-catalog-demo/wwwroot/media/js/dashboard.js
@@ -0,0 +1,76 @@
+$(function () {
+
+    //$.ajax('data/nvd3-pie.js', { "dataType": "json" })
+    $.ajax('api/Product/report1', { "dataType": "json" })
+        .done(function (testdata) {
+
+            var width = 300;
+            var height = 300;
+
+            nv.addGraph(function () {
+                var chart =
+                    nv.models
+                    .pie()
+                        .width(width)
+                        .height(height)
+                        .labelType(function (d, i, values) {
+                            return values.key + ':' + values.value;
+                        });
+
+                d3.select("#pie1")
+                        .datum([testdata])
+                        .transition().duration(1200)
+                        .attr('width', width)
+                        .attr('height', height)
+                        .call(chart);
+
+                return chart;
+            });
+
+            nv.addGraph(function () {
+                var chart = nv.models.pie()
+                        .x(function (d) { return d.key; })
+                        .y(function (d) { return d.y; })
+                        .width(width)
+                        .height(height)
+                        .labelType('percent')
+                        .valueFormat(d3.format('%'))
+                        .donut(true);
+
+                d3.select("#pie2")
+                        .datum([testdata])
+                        .transition().duration(1200)
+                        .attr('width', width)
+                        .attr('height', height)
+                        .call(chart);
+
+                return chart;
+            });
+
+        });
+    
+    //$.ajax('data/nvd3-multibar.js', { "dataType": "json" })
+    $.ajax('api/Product/report2', { "dataType": "json" })
+             .done(function (exampleData) {
+
+                 nv.addGraph(function () {
+                     var chart = nv.models.multiBarChart()
+                       .reduceXTicks(true)   //If 'false', every single x-axis tick label will be rendered.
+                       .rotateLabels(0)      //Angle to rotate x-axis labels.
+                       .showControls(false)   //Allow user to switch between 'Grouped' and 'Stacked' mode.
+                       .groupSpacing(0.1)    //Distance between each group of bars.
+                     ;
+
+                     chart.yAxis
+                         .tickFormat(d3.format(',.1f'));
+
+                     d3.select('svg#chart1')
+                         .datum(exampleData)
+                         .call(chart);
+
+                     nv.utils.windowResize(chart.update);
+
+                     return chart;
+                 });
+             });
+});
\ No newline at end of file
diff --git a/samples/demos/belgrade-product-catalog-demo/wwwroot/temporal.html b/samples/demos/belgrade-product-catalog-demo/wwwroot/temporal.html
index adcb0937..d083e001 100644
--- a/samples/demos/belgrade-product-catalog-demo/wwwroot/temporal.html
+++ b/samples/demos/belgrade-product-catalog-demo/wwwroot/temporal.html
@@ -44,8 +44,7 @@
             <div id="navbar" class="navbar-collapse collapse">
                 <ul class="nav navbar-nav">
                     <li><a href="index.html">Product List</a></li>
-                    <li><a href="report-pie.html">Products by color</a></li>
-                    <li><a href="report-multibar.html">Quantity by company/color</a></li>
+                    <li><a href="dashboard.html">Dashboard</a></li>
                     <li class="active"><a href="#">Product History</a></li>
                 </ul>
                 <ul class="nav navbar-nav pull-right">