diff --git a/ApplicationModel.sln b/ApplicationModel.sln
index 1aec796e..4ec90a25 100644
--- a/ApplicationModel.sln
+++ b/ApplicationModel.sln
@@ -53,6 +53,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Main", "Samples\eCommerce\B
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Swagger", "Source\DotNET\Swagger\Swagger.csproj", "{60FCC3B5-C43E-48DB-B824-048CB83E3121}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Concepts", "Samples\eCommerce\Basic\Concepts\Concepts.csproj", "{E20B9A82-26AC-44A7-9FC2-257FFCBB5588}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -110,6 +112,10 @@ Global
 		{69446010-6160-41DD-A97A-81130DCE5021}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{69446010-6160-41DD-A97A-81130DCE5021}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{69446010-6160-41DD-A97A-81130DCE5021}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E20B9A82-26AC-44A7-9FC2-257FFCBB5588}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E20B9A82-26AC-44A7-9FC2-257FFCBB5588}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E20B9A82-26AC-44A7-9FC2-257FFCBB5588}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E20B9A82-26AC-44A7-9FC2-257FFCBB5588}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EFC578AE-4227-43CF-97AF-5D8406BA4830}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EFC578AE-4227-43CF-97AF-5D8406BA4830}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EFC578AE-4227-43CF-97AF-5D8406BA4830}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -131,6 +137,7 @@ Global
 		{856932F6-D1D1-41CC-808B-A3741518DACC} = {CB36289F-614E-4733-B81A-74AC5658E5CB}
 		{AA6A18EA-D0F5-41C7-AF7D-1BD124022C71} = {856932F6-D1D1-41CC-808B-A3741518DACC}
 		{B2BF4443-5421-4275-A6A4-83C3E1C140B5} = {856932F6-D1D1-41CC-808B-A3741518DACC}
+		{E20B9A82-26AC-44A7-9FC2-257FFCBB5588} = {CB336696-AD34-4F0E-8BBD-0B65B0EE022F}
 		{FC67C7C1-EBC1-430E-9229-BF694CC67820} = {CB36289F-614E-4733-B81A-74AC5658E5CB}
 		{A495F734-D1D2-453B-97BA-90FD1F95A66B} = {856932F6-D1D1-41CC-808B-A3741518DACC}
 		{D25312B1-B1F7-44EA-8FBF-1910DEC9C1FA} = {A495F734-D1D2-453B-97BA-90FD1F95A66B}
diff --git a/Source/DotNET/Tools/ProxyGenerator/Templates/ObservableQuery.hbs b/Source/DotNET/Tools/ProxyGenerator/Templates/ObservableQuery.hbs
index 3c1e1740..54e4475f 100644
--- a/Source/DotNET/Tools/ProxyGenerator/Templates/ObservableQuery.hbs
+++ b/Source/DotNET/Tools/ProxyGenerator/Templates/ObservableQuery.hbs
@@ -118,7 +118,7 @@ export class {{Name}} extends ObservableQueryFor<{{Model}}> {
 {{else}}
     static use(args?: {{Name}}Arguments): [QueryResultWithState<{{Model}}>] {
         const [result] = useObservableQuery<{{Model}}, {{Name}}, {{Name}}Arguments>({{Name}}, args);
-        return result;
+        return [result];
     }
 {{/if}}    
 {{else}}
@@ -133,7 +133,7 @@ export class {{Name}} extends ObservableQueryFor<{{Model}}> {
 {{else}}
     static use(): [QueryResultWithState<{{Model}}>] {
         const [result] = useObservableQuery<{{Model}}, {{Name}}>({{Name}});
-        return result;
+        return [result];
     }
 {{/if}}
 {{/if}}