diff --git a/ResourceHeaderTemplateDemo/MainWindow.xaml b/ResourceHeaderTemplateDemo/MainWindow.xaml
index 0ed8d28..697a294 100644
--- a/ResourceHeaderTemplateDemo/MainWindow.xaml
+++ b/ResourceHeaderTemplateDemo/MainWindow.xaml
@@ -11,12 +11,12 @@
         mc:Ignorable="d"
         Title="ResourceHeaderTemplateDemo" Height="600" Width="950" WindowStartupLocation="CenterScreen">
     <Window.Resources>
-        <x:Array x:Key="schedulerViewTypes" Type="system:String">
-            <system:String>Day</system:String>
-            <system:String>Week</system:String>
-            <system:String>WorkWeek</system:String>
-            <system:String>Timeline</system:String>
-        </x:Array>
+        <ObjectDataProvider x:Key="schedulerviewtypes" MethodName="GetValues"
+                            ObjectType="{x:Type system:Enum}">
+            <ObjectDataProvider.MethodParameters>
+                <x:Type  Type="{x:Type syncfusion:SchedulerViewType}"/>
+            </ObjectDataProvider.MethodParameters>
+        </ObjectDataProvider>
         <ObjectDataProvider x:Key="resourceGrouptypes" MethodName="GetValues"
                             ObjectType="{x:Type system:Enum}">
             <ObjectDataProvider.MethodParameters>
@@ -27,14 +27,14 @@
             <Grid Background="Transparent">
                 <Border BorderThickness="0.3,0.3,0,0.3" BorderBrush="Gray" >
                     <StackPanel VerticalAlignment="Center" Orientation="Vertical">
-                        <Border CornerRadius="36" Height="72" Width="72" BorderThickness="4" BorderBrush="{Binding BackgroundBrush}">
+                        <Border CornerRadius="36" Height="72" Width="72" BorderThickness="4" BorderBrush="{Binding Data.BackgroundBrush}">
                             <Border CornerRadius="36" Height="64" Width="64" BorderThickness="4" BorderBrush="White">
                                 <Image HorizontalAlignment="Center" VerticalAlignment="Center" Width="55"
-                          Height="55" Source="{Binding ImageSource}" />
+                          Height="55" Source="{Binding Data.ImageSource}" />
                             </Border>
                         </Border>
                         <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="15"
-                   Foreground="Black" Text="{Binding Name}" />
+                Foreground="Black" Text="{Binding Data.Name}" />
                     </StackPanel>
                 </Border>
             </Grid>
@@ -64,8 +64,8 @@
             HorizontalAlignment="Right"
             VerticalAlignment="Top"
             Margin="0,0,25,0">
-            <ComboBox x:Name="schedulerViewTypeComboBox" ItemsSource="{Binding Source={StaticResource schedulerViewTypes}}"
-                                 SelectedIndex="1" Width="100" Margin="5"/>
+            <ComboBox x:Name="schedulerViewTypeComboBox" ItemsSource="{Binding Source={StaticResource schedulerviewtypes}}"
+                                 SelectedIndex="1" Width="150" Margin="5"/>
             <ComboBox x:Name="resourceGroupTypeComboBox" ItemsSource="{Binding Source={StaticResource resourceGrouptypes}}"
                                  SelectedIndex="1"  Width="100" Margin="5"/>
         </StackPanel>
diff --git a/ResourceHeaderTemplateSelectorDemo/Helper/ResourceTemplateSelector.cs b/ResourceHeaderTemplateSelectorDemo/Helper/ResourceTemplateSelector.cs
index 569438d..9f6b54f 100644
--- a/ResourceHeaderTemplateSelectorDemo/Helper/ResourceTemplateSelector.cs
+++ b/ResourceHeaderTemplateSelectorDemo/Helper/ResourceTemplateSelector.cs
@@ -34,7 +34,7 @@ public override DataTemplate SelectTemplate(object item, DependencyObject contai
             if (schedule == null)
                 return null;
 
-            if (schedule.ViewType != SchedulerViewType.Timeline)
+            if (schedule.ViewType == SchedulerViewType.Day || schedule.ViewType == SchedulerViewType.Week || schedule.ViewType == SchedulerViewType.WorkWeek)
                 return DayViewResourceTemplate;
             else
                 return TimelineViewResourceTemplate;
diff --git a/ResourceHeaderTemplateSelectorDemo/MainWindow.xaml b/ResourceHeaderTemplateSelectorDemo/MainWindow.xaml
index b56bce2..41bbe40 100644
--- a/ResourceHeaderTemplateSelectorDemo/MainWindow.xaml
+++ b/ResourceHeaderTemplateSelectorDemo/MainWindow.xaml
@@ -11,12 +11,12 @@
         mc:Ignorable="d"
         Title="ResourceHeaderTemplateSelectorDemo" Height="600" Width="950" WindowStartupLocation="CenterScreen">
     <Window.Resources>
-        <x:Array x:Key="schedulerViewTypes" Type="system:String">
-            <system:String>Day</system:String>
-            <system:String>Week</system:String>
-            <system:String>WorkWeek</system:String>
-            <system:String>Timeline</system:String>
-        </x:Array>
+        <ObjectDataProvider x:Key="schedulerviewtypes" MethodName="GetValues"
+                            ObjectType="{x:Type system:Enum}">
+            <ObjectDataProvider.MethodParameters>
+                <x:Type  Type="{x:Type syncfusion:SchedulerViewType}"/>
+            </ObjectDataProvider.MethodParameters>
+        </ObjectDataProvider>
         <ObjectDataProvider x:Key="resourceGrouptypes" MethodName="GetValues"
                             ObjectType="{x:Type system:Enum}">
             <ObjectDataProvider.MethodParameters>
@@ -27,14 +27,14 @@
             <Grid Background="Transparent">
                 <Border BorderThickness="0.3,0.3,0,0.3" BorderBrush="Gray" >
                     <StackPanel VerticalAlignment="Center" Orientation="Vertical">
-                        <Border CornerRadius="36" Height="72" Width="72" BorderThickness="4" BorderBrush="{Binding BackgroundBrush}">
+                        <Border CornerRadius="36" Height="72" Width="72" BorderThickness="4" BorderBrush="{Binding Data.BackgroundBrush}">
                             <Border CornerRadius="36" Height="64" Width="64" BorderThickness="4" BorderBrush="White">
                                 <Image HorizontalAlignment="Center" VerticalAlignment="Center" Width="55"
-                          Height="55" Source="{Binding ImageSource}" />
+                          Height="55" Source="{Binding Data.ImageSource}" />
                             </Border>
                         </Border>
                         <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="15"
-                   Foreground="Black" Text="{Binding Name}" />
+                   Foreground="Black" Text="{Binding Data.Name}" />
                     </StackPanel>
                 </Border>
             </Grid>
@@ -42,18 +42,18 @@
         <DataTemplate x:Key="TimelineViewResourceTemplate">
             <Grid Background="Transparent">
                 <StackPanel VerticalAlignment="Center" Orientation="Vertical">
-                    <Border CornerRadius="36" Height="72" Width="72" BorderThickness="4" BorderBrush="{Binding BackgroundBrush}">
+                    <Border CornerRadius="36" Height="72" Width="72" BorderThickness="4" BorderBrush="{Binding Data.BackgroundBrush}">
                         <Border CornerRadius="36" Height="64" Width="64" BorderThickness="4" BorderBrush="Transparent">
                             <Image HorizontalAlignment="Center" VerticalAlignment="Center"
                                    Width="55"
                                    Height="55"
-                                   Source="{Binding ImageSource}" />
+                                   Source="{Binding Data.ImageSource}" />
                         </Border>
                     </Border>
                     <TextBlock HorizontalAlignment="Center"
                                VerticalAlignment="Center"
                                FontSize="15"
-                               Text="{Binding Name}"/>
+                               Text="{Binding Data.Name}"/>
                 </StackPanel>
             </Grid>
         </DataTemplate>
@@ -84,8 +84,8 @@
             HorizontalAlignment="Right"
             VerticalAlignment="Top"
             Margin="0,0,25,0">
-            <ComboBox x:Name="schedulerViewTypeComboBox" ItemsSource="{Binding Source={StaticResource schedulerViewTypes}}"
-                                 SelectedIndex="1" Width="100" Margin="5"/>
+            <ComboBox x:Name="schedulerViewTypeComboBox" ItemsSource="{Binding Source={StaticResource schedulerviewtypes}}"
+                                 SelectedIndex="1" Width="150" Margin="5"/>
             <ComboBox x:Name="resourceGroupTypeComboBox" ItemsSource="{Binding Source={StaticResource resourceGrouptypes}}"
                                  SelectedIndex="1"  Width="100" Margin="5"/>
         </StackPanel>