diff --git a/src/Microsoft.SqlTools.SqlCore/ObjectExplorer/SmoModel/SmoTreeNodes.cs b/src/Microsoft.SqlTools.SqlCore/ObjectExplorer/SmoModel/SmoTreeNodes.cs
index bf92e2b6d1..8547474e08 100644
--- a/src/Microsoft.SqlTools.SqlCore/ObjectExplorer/SmoModel/SmoTreeNodes.cs
+++ b/src/Microsoft.SqlTools.SqlCore/ObjectExplorer/SmoModel/SmoTreeNodes.cs
@@ -910,7 +910,7 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
                 NodeValue = SR.SchemaHierarchy_Programmability,
                 NodeTypeId = NodeTypes.Programmability,
                 IsSystemObject = false,
-                ValidFor = ValidForFlag.NotSqlDemand,
+                ValidFor = ValidForFlag.All,
                 SortPriority = SmoTreeNode.NextSortPriority,
             });
             currentChildren.Add(new FolderNode {
@@ -1168,7 +1168,7 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
                 NodeValue = SR.SchemaHierarchy_Programmability,
                 NodeTypeId = NodeTypes.ExpandableSchemaProgrammability,
                 IsSystemObject = false,
-                ValidFor = ValidForFlag.NotSqlDemand,
+                ValidFor = ValidForFlag.All,
                 SortPriority = SmoTreeNode.NextSortPriority,
             });
         }
@@ -1622,7 +1622,7 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
                     NodeValue = SR.SchemaHierarchy_Functions,
                     NodeTypeId = NodeTypes.Functions,
                     IsSystemObject = false,
-                    ValidFor = ValidForFlag.NotSqlDemand,
+                    ValidFor = ValidForFlag.All,
                     SortPriority = SmoTreeNode.NextSortPriority,
                 });
 			}
@@ -1758,7 +1758,7 @@ protected override void OnExpandPopulateFolders(IList<TreeNode> currentChildren,
                 NodeValue = SR.SchemaHierarchy_Functions,
                 NodeTypeId = NodeTypes.Functions,
                 IsSystemObject = false,
-                ValidFor = ValidForFlag.NotSqlDemand,
+                ValidFor = ValidForFlag.All,
                 SortPriority = SmoTreeNode.NextSortPriority,
             });
             currentChildren.Add(new FolderNode {
diff --git a/src/Microsoft.SqlTools.SqlCore/ObjectExplorer/SmoModel/SmoTreeNodesDefinition.xml b/src/Microsoft.SqlTools.SqlCore/ObjectExplorer/SmoModel/SmoTreeNodesDefinition.xml
index a4aa1fd4cc..4b0e023bbd 100644
--- a/src/Microsoft.SqlTools.SqlCore/ObjectExplorer/SmoModel/SmoTreeNodesDefinition.xml
+++ b/src/Microsoft.SqlTools.SqlCore/ObjectExplorer/SmoModel/SmoTreeNodesDefinition.xml
@@ -153,7 +153,7 @@
   </Node>
 
   <Node Name="Synonyms" LocLabel="SR.SchemaHierarchy_Synonyms" BaseClass="ModelBased" Strategy="MultipleElementsOfType" NodeType="Synonym" ChildQuerierTypes="SqlSynonym" ValidFor="AllOnPrem|AzureV12"/>
-  <Node Name="Programmability" LocLabel="SR.SchemaHierarchy_Programmability" BaseClass="ModelBased" ValidFor="NotSqlDemand">
+  <Node Name="Programmability" LocLabel="SR.SchemaHierarchy_Programmability" BaseClass="ModelBased" ValidFor="All">
     <Child Name="StoredProcedures" SettingsFlag="!GroupBySchema"/>
     <Child Name="Functions" SettingsFlag="!GroupBySchema"/>
     <Child Name="DatabaseTriggers"/>
@@ -165,7 +165,7 @@
     -->
     <Child Name="Sequences" SettingsFlag="!GroupBySchema"/>
   </Node>
-  <Node Name="ExpandableSchemaProgrammability" LocLabel="SR.SchemaHierarchy_Programmability" BaseClass="ModelBased" ValidFor="NotSqlDemand">
+  <Node Name="ExpandableSchemaProgrammability" LocLabel="SR.SchemaHierarchy_Programmability" BaseClass="ModelBased" ValidFor="All">
     <Child Name="StoredProcedures"/>
     <Child Name="Functions"/>
     <Child Name="Types"/>
@@ -329,7 +329,7 @@
     <Child Name="Statistics"/>
   </Node>
 
-  <Node Name="Functions" LocLabel="SR.SchemaHierarchy_Functions" BaseClass="ModelBased" ValidFor="NotSqlDemand">
+  <Node Name="Functions" LocLabel="SR.SchemaHierarchy_Functions" BaseClass="ModelBased" ValidFor="All">
     <Child Name="SystemFunctions" IsSystemObject="1"/>
     <Child Name="TableValuedFunctions"/>
     <Child Name="ScalarValuedFunctions"/>