diff --git a/Constants/ConstIni.vb b/Constants/ConstIni.vb
index a44b95c..4c811ed 100644
--- a/Constants/ConstIni.vb
+++ b/Constants/ConstIni.vb
@@ -114,6 +114,8 @@ Module ConstIni
    Public Const K_SELGEOMMORTISING As String = "SelGeomMortising"
    Public Const K_SELGEOMSAWROUGHING As String = "SelGeomSawRoughing"
    Public Const K_SELGEOMSAWFINISHING As String = "SelGeomSawFinishing"
+   Public Const K_SELGEOMGENMACHINING As String = "SelGeomGenMachining"
+   Public Const K_SELGEOMCHISELING As String = "SelGeomChiseling"
    Public Const K_MACHININGGROUP As String = "MachiningGroup"
 
    Public Const S_SIMUL As String = "Simul"
diff --git a/MachiningsDbWindow/MachiningsDbView.xaml b/MachiningsDbWindow/MachiningsDbView.xaml
index 673796f..1a5ce09 100644
--- a/MachiningsDbWindow/MachiningsDbView.xaml
+++ b/MachiningsDbWindow/MachiningsDbView.xaml
@@ -1261,15 +1261,15 @@
                             <ColumnDefinition Width="1*"/>
                          </Grid.ColumnDefinitions>
                          <Grid.RowDefinitions>
-                           <RowDefinition Height="1*"/>
-                           <RowDefinition Height="1*"/>
+                            <RowDefinition Height="1*"/>
+                            <RowDefinition Height="1*"/>
                          </Grid.RowDefinitions>
 
-                       <TextBlock Text="{Binding SideAngleTxBl}" Style="{StaticResource MachiningsToolTextBlock}"
+                       <TextBlock Text="{Binding SideAngleTxBl}" Style="{StaticResource MachiningsTextBlock}"
                                  Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
                                               Converter={StaticResource MachiningParamVisibilityConverter},
                                               ConverterParameter={StaticResource SideAngle}}"/>
-                       <EgtWPFLib5:EgtTextBox Name="SideAngleTxBx" Grid.Column="1" Style="{StaticResource MachiningsToolTextBox}"
+                       <EgtWPFLib5:EgtTextBox Name="SideAngleTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
                                               Text="{Binding Path=SelectedItem.SideAngle,
                                                     ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
                                               Visibility="{Binding Path=SelectedItem.Type,
diff --git a/OptionsWindow/OptionModule.vb b/OptionsWindow/OptionModule.vb
index 7f9c708..39ed2fc 100644
--- a/OptionsWindow/OptionModule.vb
+++ b/OptionsWindow/OptionModule.vb
@@ -14,6 +14,8 @@ Friend Module OptionModule
    Friend m_SelGeomMortising As SceneSelModeOpt
    Friend m_SelGeomSawRoughing As SceneSelModeOpt
    Friend m_SelGeomSawFinishing As SceneSelModeOpt
+   Friend m_SelGeomGenMachining As SceneSelModeOpt
+   Friend m_SelGeomChiseling As SceneSelModeOpt
 
    ' Variabile che indica se quando viene creata una nuova operazione di lavorazione deve essere aggiunta in fondo
    ' alla fase o subito dopo la lavorazione selezionata
@@ -39,6 +41,10 @@ Friend Module OptionModule
       m_SelGeomSawRoughing = If(Temp < 0 Or Temp > 3, SceneSelModeOpt.PARTCURVESANDSURFACES, DirectCast(Temp, SceneSelModeOpt))
       Temp = GetPrivateProfileInt(S_MACH, K_SELGEOMSAWFINISHING, -1)
       m_SelGeomSawFinishing = If(Temp < 0 Or Temp > 3, SceneSelModeOpt.PARTCURVESANDSURFACES, DirectCast(Temp, SceneSelModeOpt))
+      Temp = GetPrivateProfileInt(S_MACH, K_SELGEOMGENMACHINING, -1)
+      m_SelGeomGenMachining = If(Temp < 0 Or Temp > 3, SceneSelModeOpt.PARTCURVESANDSURFACES, DirectCast(Temp, SceneSelModeOpt))
+      Temp = GetPrivateProfileInt(S_MACH, K_SELGEOMCHISELING, -1)
+      m_SelGeomChiseling = If(Temp < 0 Or Temp > 3, SceneSelModeOpt.PARTCURVESANDSURFACES, DirectCast(Temp, SceneSelModeOpt))
       ' Inizializzo variabile che indica posizione nuova operazione di lavorazione
       m_bNewMachiningIsLastOne = If(GetPrivateProfileInt(S_OPTIONS, K_NEWMACHININGISLASTONE, 0) <> 0, True, False)
       ' Inizializzo variabile che indica se usare script di disposizione
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderViewModel.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderViewModel.vb
index 9732b9c..db7a799 100644
--- a/ProjectPage/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderViewModel.vb
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderViewModel.vb
@@ -180,7 +180,7 @@ Namespace EgtCAM5
       ''' Method that search the machines in the correct folder and add to the MachinesList those valid.
       ''' </summary>
       Private Sub LoadSelectedMachineMachinings()
-         Dim ActiveMachiningsTypes() As MachiningsType = ReadActiveMachiningsFamilies()
+         Dim ActiveMachiningsTypes() As MachiningsType = MachineModel.ReadActiveMachiningsFamilies()
          For Each MachiningsType In ActiveMachiningsTypes
             Dim FamilyTreeView As New FamilyMachiningTreeViewExpanderItem(MachiningsType.TypeName, MachiningsType.TypeId)
             MachiningsList.Add(FamilyTreeView)
@@ -201,48 +201,6 @@ Namespace EgtCAM5
          End If
       End Sub
 
-      ''' <summary>
-      ''' Method that search the machines in the correct folder and add to the MachinesList those valid.
-      ''' </summary>
-      Private Function ReadActiveMachiningsFamilies() As MachiningsType()
-         Dim ActiveMachiningsFamiliesList As New List(Of MachiningsType)
-         If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_DRILLING, 0, m_sCurrMachIniFilePath) <> 0 Then
-            ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.DRILLING, .TypeName = EgtMsg(MSG_MACHININGSDBPAGE + 1)})
-         End If
-         If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_SAWING, 0, m_sCurrMachIniFilePath) <> 0 Then
-            ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.SAWING, .TypeName = EgtMsg(MSG_MACHININGSDBPAGE + 2)})
-         End If
-         If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_MILLING, 0, m_sCurrMachIniFilePath) <> 0 Then
-            ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.MILLING, .TypeName = EgtMsg(MSG_MACHININGSDBPAGE + 3)})
-         End If
-         If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_POCKETING, 0, m_sCurrMachIniFilePath) <> 0 Then
-            ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.POCKETING, .TypeName = EgtMsg(MSG_MACHININGSDBPAGE + 4)})
-         End If
-         If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_MORTISING, 0, m_sCurrMachIniFilePath) <> 0 Then
-            ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.MORTISING, .TypeName = EgtMsg(MSG_MACHININGSDBPAGE + 5)})
-         End If
-         If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_SAWROUGHING, 0, m_sCurrMachIniFilePath) <> 0 Then
-            ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.SAWROUGHING, .TypeName = EgtMsg(MSG_MACHININGSDBPAGE + 6)})
-         End If
-         If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_SAWFINISHING, 0, m_sCurrMachIniFilePath) <> 0 Then
-            ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.SAWFINISHING, .TypeName = EgtMsg(MSG_MACHININGSDBPAGE + 7)})
-         End If
-         If EgtUILib.GetPrivateProfileInt(S_MACHININGS, K_GENMACHINING, 0, m_sCurrMachIniFilePath) <> 0 Then
-            ActiveMachiningsFamiliesList.Add(New MachiningsType With {.TypeId = MCH_MY.GENMACHINING, .TypeName = EgtMsg(MSG_MACHININGSDBPAGE + 8)})
-         End If
-         Return ActiveMachiningsFamiliesList.ToArray
-      End Function
-
-      ''' <summary>
-      ''' Structure that represent a tool's family, containing family type and family name
-      ''' </summary>
-      Structure MachiningsType
-
-         Friend TypeId As MCH_MY
-         Friend TypeName As String
-
-      End Structure
-
 #End Region
 
    End Class
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderView.xaml b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderView.xaml
index ecfad39..3582014 100644
--- a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderView.xaml
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderView.xaml
@@ -143,13 +143,28 @@
                             IsSynchronizedWithCurrentItem="True">
                   </ComboBox>
                </UniformGrid>
+               <UniformGrid Columns="2" Visibility="{Binding Type,
+                                        Converter={StaticResource OperationParamVisibilityConverter},
+                                        ConverterParameter={StaticResource SubType}}">
+                  <TextBlock Text="{Binding SubTypeMsg}"/>
+                  <ComboBox ItemsSource="{Binding SubTypeList, Mode=OneWay}"
+                            SelectedIndex="{Binding SelectedSubType}"
+                            IsSynchronizedWithCurrentItem="True">
+                  </ComboBox>
+               </UniformGrid>
                <UniformGrid Columns="2" Visibility="{Binding Type,
                                                              Converter={StaticResource OperationParamVisibilityConverter},
                                                              ConverterParameter={StaticResource StepPar}}">
                   <TextBlock Text="{Binding StepParMsg}"/>
                   <EgtWPFLib5:EgtTextBox Text="{Binding StepPar, UpdateSourceTrigger=PropertyChanged}"/>
                </UniformGrid>
-            <UniformGrid Columns="2" Visibility="{Binding Type,
+               <UniformGrid Columns="2" Visibility="{Binding Type,
+                                                             Converter={StaticResource OperationParamVisibilityConverter},
+                                                             ConverterParameter={StaticResource SideStep}}">
+                  <TextBlock Text="{Binding SideStepMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding SideStep, UpdateSourceTrigger=PropertyChanged}"/>
+               </UniformGrid>
+               <UniformGrid Columns="2" Visibility="{Binding Type,
                                         Converter={StaticResource OperationParamVisibilityConverter},
                                         ConverterParameter={StaticResource StartSlowLen}}">
                   <TextBlock Text="{Binding StartSlowLenMsg}"/>
@@ -362,23 +377,39 @@
                <TextBlock Text="{Binding ToolExpanderHeader}"/>
             </Expander.Header>
             <StackPanel>
-               <UniformGrid Columns="2">
+               <UniformGrid Columns="2"
+                            Visibility="{Binding Type,
+                                                 Converter={StaticResource OperationParamVisibilityConverter},
+                                                 ConverterParameter={StaticResource Speed}}">
                   <TextBlock Text="{Binding SpeedMsg}"/>
                   <EgtWPFLib5:EgtTextBox Text="{Binding Speed, UpdateSourceTrigger=PropertyChanged}"/>
                </UniformGrid>
-               <UniformGrid Columns="2">
+               <UniformGrid Columns="2"
+                            Visibility="{Binding Type,
+                                  Converter={StaticResource OperationParamVisibilityConverter},
+                                  ConverterParameter={StaticResource Feed}}">
+
                   <TextBlock Text="{Binding FeedMsg}"/>
                   <EgtWPFLib5:EgtTextBox Text="{Binding Feed, UpdateSourceTrigger=PropertyChanged}"/>
                </UniformGrid>
-               <UniformGrid Columns="2">
+               <UniformGrid Columns="2"
+                            Visibility="{Binding Type,
+                            Converter={StaticResource OperationParamVisibilityConverter},
+                            ConverterParameter={StaticResource TipFeed}}">
                   <TextBlock Text="{Binding TipFeedMsg}"/>
                   <EgtWPFLib5:EgtTextBox Text="{Binding TipFeed, UpdateSourceTrigger=PropertyChanged}"/>
                </UniformGrid>
-               <UniformGrid Columns="2">
+               <UniformGrid Columns="2"
+                            Visibility="{Binding Type,
+                            Converter={StaticResource OperationParamVisibilityConverter},
+                            ConverterParameter={StaticResource StartFeed}}">
                   <TextBlock Text="{Binding StartFeedMsg}"/>
                   <EgtWPFLib5:EgtTextBox Text="{Binding StartFeed, UpdateSourceTrigger=PropertyChanged}"/>
                </UniformGrid>
-               <UniformGrid Columns="2">
+               <UniformGrid Columns="2"
+                            Visibility="{Binding Type,
+                            Converter={StaticResource OperationParamVisibilityConverter},
+                            ConverterParameter={StaticResource EndFeed}}">
                   <TextBlock Text="{Binding EndFeedMsg}"/>
                   <EgtWPFLib5:EgtTextBox Text="{Binding EndFeed, UpdateSourceTrigger=PropertyChanged}"/>
                </UniformGrid>
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderViewModel.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderViewModel.vb
index 38bf1c6..28c1b77 100644
--- a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderViewModel.vb
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderViewModel.vb
@@ -67,9 +67,20 @@ Namespace EgtCAM5
       End Property
 
       'ObservableCollection che contiene le variabili per il combobox WorkSide
-      Private m_WorkSideList As New ObservableCollection(Of IdNameStruct)({New IdNameStruct(MCH_SAW_WS.CENTER, EgtMsg(MSG_MACHININGSDBPAGE + 120)), New IdNameStruct(MCH_SAW_WS.LEFT, EgtMsg(MSG_MACHININGSDBPAGE + 121)), New IdNameStruct(MCH_SAW_WS.RIGHT, EgtMsg(MSG_MACHININGSDBPAGE + 122))})
+      Private m_WorkSideList As ObservableCollection(Of IdNameStruct)
       Public ReadOnly Property WorkSideList As ObservableCollection(Of IdNameStruct)
          Get
+            Select Case m_Type
+               Case MCH_MY.CHISELING
+                  m_WorkSideList = New ObservableCollection(Of IdNameStruct)(
+                                             {New IdNameStruct(MCH_CHISEL_WS.LEFT, EgtMsg(MSG_MACHININGSDBPAGE + 121)),
+                                              New IdNameStruct(MCH_CHISEL_WS.RIGHT, EgtMsg(MSG_MACHININGSDBPAGE + 122))})
+               Case Else
+                  m_WorkSideList = New ObservableCollection(Of IdNameStruct)(
+                                             {New IdNameStruct(MCH_SAW_WS.CENTER, EgtMsg(MSG_MACHININGSDBPAGE + 120)),
+                                              New IdNameStruct(MCH_SAW_WS.LEFT, EgtMsg(MSG_MACHININGSDBPAGE + 121)),
+                                              New IdNameStruct(MCH_SAW_WS.RIGHT, EgtMsg(MSG_MACHININGSDBPAGE + 122))})
+            End Select
             Return m_WorkSideList
          End Get
       End Property
@@ -80,14 +91,15 @@ Namespace EgtCAM5
       Public Property SelectedWorkSide As Integer
          Get
             If IsNothing(WorkSideList) Then Return Nothing
-            Return IdNameStruct.SearchFromId(m_SelectedWorkSide, WorkSideList)
+            Return m_SelectedWorkSide
          End Get
          Set(value As Integer)
             If value <> m_SelectedWorkSide Then
                If Not IsNothing(WorkSideList) Then
-                  m_SelectedWorkSide = IdNameStruct.SearchToId(value, WorkSideList)
+                  m_SelectedWorkSide = value
                   Dim OrigWorkSide As Integer = 0
                   EgtGetMachiningParam(MCH_MP.WORKSIDE, OrigWorkSide)
+                  OrigWorkSide = IdNameStruct.SearchToId(OrigWorkSide, WorkSideList)
                   m_IsModifiedSelectedWorkSide = If(value <> OrigWorkSide, True, False)
                   NotifyPropertyChanged("UpdateMachiningBtnIsEnabled")
                End If
@@ -109,14 +121,15 @@ Namespace EgtCAM5
       Public Property SelectedHeadSide As Integer
          Get
             If IsNothing(HeadSideList) Then Return Nothing
-            Return IdNameStruct.SearchFromId(m_SelectedHeadSide, HeadSideList)
+            Return m_SelectedHeadSide
          End Get
          Set(value As Integer)
             If value <> m_SelectedHeadSide Then
                If Not IsNothing(HeadSideList) Then
-                  m_SelectedHeadSide = IdNameStruct.SearchToId(value, HeadSideList)
+                  m_SelectedHeadSide = value
                   Dim OrigHeadSide As Integer = 0
                   EgtGetMachiningParam(MCH_MP.HEADSIDE, OrigHeadSide)
+                  OrigHeadSide = IdNameStruct.SearchToId(OrigHeadSide, HeadSideList)
                   m_IsModifiedSelectedHeadSide = If(value <> OrigHeadSide, True, False)
                   NotifyPropertyChanged("UpdateMachiningBtnIsEnabled")
                End If
@@ -130,9 +143,26 @@ Namespace EgtCAM5
          Get
             Select Case m_Type
                Case MCH_MY.SAWING
-                  m_LeadInTypeList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(MCH_SAW_LI.CENT, EgtMsg(MSG_MACHININGSDBPAGE + 120)), New IdNameStruct(MCH_SAW_LI.STRICT, EgtMsg(MSG_MACHININGSDBPAGE + 125)), New IdNameStruct(MCH_SAW_LI.OUT, EgtMsg(MSG_MACHININGSDBPAGE + 126)), New IdNameStruct(MCH_SAW_LI.EXT_CENT, EgtMsg(MSG_MACHININGSDBPAGE + 127)), New IdNameStruct(MCH_SAW_LI.EXT_OUT, EgtMsg(MSG_MACHININGSDBPAGE + 128))})
+                  m_LeadInTypeList = New ObservableCollection(Of IdNameStruct)(
+                                             {New IdNameStruct(MCH_SAW_LI.CENT, EgtMsg(MSG_MACHININGSDBPAGE + 120)),
+                                              New IdNameStruct(MCH_SAW_LI.STRICT, EgtMsg(MSG_MACHININGSDBPAGE + 125)),
+                                              New IdNameStruct(MCH_SAW_LI.OUT, EgtMsg(MSG_MACHININGSDBPAGE + 126)),
+                                              New IdNameStruct(MCH_SAW_LI.EXT_CENT, EgtMsg(MSG_MACHININGSDBPAGE + 127)),
+                                              New IdNameStruct(MCH_SAW_LI.EXT_OUT, EgtMsg(MSG_MACHININGSDBPAGE + 128))})
                Case MCH_MY.MILLING
-                  m_LeadInTypeList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(MCH_MIL_LI.NONE, EgtMsg(MSG_MACHININGSDBPAGE + 129)), New IdNameStruct(MCH_MIL_LI.LINEAR, EgtMsg(MSG_MACHININGSDBPAGE + 130)), New IdNameStruct(MCH_MIL_LI.TANGENT, EgtMsg(MSG_MACHININGSDBPAGE + 131)), New IdNameStruct(MCH_MIL_LI.GLIDE, EgtMsg(MSG_MACHININGSDBPAGE + 132)), New IdNameStruct(MCH_MIL_LI.ZIGZAG, EgtMsg(MSG_MACHININGSDBPAGE + 142)), New IdNameStruct(MCH_MIL_LI.HELIX, EgtMsg(MSG_MACHININGSDBPAGE + 133))})
+                  m_LeadInTypeList = New ObservableCollection(Of IdNameStruct)(
+                                             {New IdNameStruct(MCH_MIL_LI.NONE, EgtMsg(MSG_MACHININGSDBPAGE + 129)),
+                                              New IdNameStruct(MCH_MIL_LI.LINEAR, EgtMsg(MSG_MACHININGSDBPAGE + 130)),
+                                              New IdNameStruct(MCH_MIL_LI.TANGENT, EgtMsg(MSG_MACHININGSDBPAGE + 131)),
+                                              New IdNameStruct(MCH_MIL_LI.GLIDE, EgtMsg(MSG_MACHININGSDBPAGE + 132)),
+                                              New IdNameStruct(MCH_MIL_LI.ZIGZAG, EgtMsg(MSG_MACHININGSDBPAGE + 142)),
+                                              New IdNameStruct(MCH_MIL_LI.HELIX, EgtMsg(MSG_MACHININGSDBPAGE + 133))})
+               Case MCH_MY.POCKETING
+                  m_LeadInTypeList = New ObservableCollection(Of IdNameStruct)(
+                                             {New IdNameStruct(MCH_POCK_LI.NONE, EgtMsg(MSG_MACHININGSDBPAGE + 129)),
+                                              New IdNameStruct(MCH_POCK_LI.GLIDE, EgtMsg(MSG_MACHININGSDBPAGE + 132)),
+                                              New IdNameStruct(MCH_POCK_LI.ZIGZAG, EgtMsg(MSG_MACHININGSDBPAGE + 142)),
+                                              New IdNameStruct(MCH_POCK_LI.HELIX, EgtMsg(MSG_MACHININGSDBPAGE + 133))})
                Case Else
                   m_LeadInTypeList = Nothing
             End Select
@@ -196,9 +226,21 @@ Namespace EgtCAM5
          Get
             Select Case m_Type
                Case MCH_MY.SAWING
-                  m_LeadOutTypeList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(MCH_SAW_LO.CENT, EgtMsg(MSG_MACHININGSDBPAGE + 120)), New IdNameStruct(MCH_SAW_LO.STRICT, EgtMsg(MSG_MACHININGSDBPAGE + 125)), New IdNameStruct(MCH_SAW_LO.EXT, EgtMsg(MSG_MACHININGSDBPAGE + 123))})
+                  m_LeadOutTypeList = New ObservableCollection(Of IdNameStruct)(
+                                             {New IdNameStruct(MCH_SAW_LO.CENT, EgtMsg(MSG_MACHININGSDBPAGE + 120)),
+                                              New IdNameStruct(MCH_SAW_LO.STRICT, EgtMsg(MSG_MACHININGSDBPAGE + 125)),
+                                              New IdNameStruct(MCH_SAW_LO.EXT, EgtMsg(MSG_MACHININGSDBPAGE + 123))})
                Case MCH_MY.MILLING
-                  m_LeadOutTypeList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(MCH_MIL_LO.NONE, EgtMsg(MSG_MACHININGSDBPAGE + 129)), New IdNameStruct(MCH_MIL_LO.LINEAR, EgtMsg(MSG_MACHININGSDBPAGE + 130)), New IdNameStruct(MCH_MIL_LO.TANGENT, EgtMsg(MSG_MACHININGSDBPAGE + 131)), New IdNameStruct(MCH_MIL_LO.GLIDE, EgtMsg(MSG_MACHININGSDBPAGE + 132)), New IdNameStruct(MCH_MIL_LO.AS_LI, EgtMsg(MSG_MACHININGSDBPAGE + 137))})
+                  m_LeadOutTypeList = New ObservableCollection(Of IdNameStruct)(
+                                             {New IdNameStruct(MCH_MIL_LO.NONE, EgtMsg(MSG_MACHININGSDBPAGE + 129)),
+                                              New IdNameStruct(MCH_MIL_LO.LINEAR, EgtMsg(MSG_MACHININGSDBPAGE + 130)),
+                                              New IdNameStruct(MCH_MIL_LO.TANGENT, EgtMsg(MSG_MACHININGSDBPAGE + 131)),
+                                              New IdNameStruct(MCH_MIL_LO.GLIDE, EgtMsg(MSG_MACHININGSDBPAGE + 132)),
+                                              New IdNameStruct(MCH_MIL_LO.AS_LI, EgtMsg(MSG_MACHININGSDBPAGE + 137))})
+               Case MCH_MY.POCKETING
+                  m_LeadOutTypeList = New ObservableCollection(Of IdNameStruct)(
+                                             {New IdNameStruct(MCH_POCK_LO.NONE, EgtMsg(MSG_MACHININGSDBPAGE + 129)),
+                                              New IdNameStruct(MCH_POCK_LO.GLIDE, EgtMsg(MSG_MACHININGSDBPAGE + 132))})
                Case Else
                   m_LeadOutTypeList = Nothing
             End Select
@@ -306,9 +348,15 @@ Namespace EgtCAM5
          Get
             Select Case m_Type
                Case MCH_MY.SAWFINISHING
-                  m_SubTypeList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(MCH_SAWFIN_SUB.ALONG, EgtMsg(MSG_MACHININGSDBPAGE + 146)), New IdNameStruct(MCH_SAWFIN_SUB.ACROSS, EgtMsg(MSG_MACHININGSDBPAGE + 147))})
-               Case MCH_MY.DRILLING
-                  m_SubTypeList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(0, "Prova 1"), New IdNameStruct(1, "Prova 2")})
+                  m_SubTypeList = New ObservableCollection(Of IdNameStruct)(
+                                          {New IdNameStruct(MCH_SAWFIN_SUB.ALONG, EgtMsg(MSG_MACHININGSDBPAGE + 146)),
+                                           New IdNameStruct(MCH_SAWFIN_SUB.ACROSS, EgtMsg(MSG_MACHININGSDBPAGE + 147))})
+               Case MCH_MY.POCKETING
+                  m_SubTypeList = New ObservableCollection(Of IdNameStruct)(
+                                          {New IdNameStruct(MCH_POCK_SUB.ZIGZAG, EgtMsg(MSG_MACHININGSDBPAGE + 142)),
+                                           New IdNameStruct(MCH_POCK_SUB.ONEWAY, EgtMsg(MSG_MACHININGSDBPAGE + 143)),
+                                           New IdNameStruct(MCH_POCK_SUB.SPIRALIN, EgtMsg(MSG_MACHININGSDBPAGE + 148)),
+                                           New IdNameStruct(MCH_POCK_SUB.SPIRALOUT, EgtMsg(MSG_MACHININGSDBPAGE + 149))})
                Case Else
                   m_SubTypeList = Nothing
             End Select
@@ -1927,12 +1975,24 @@ Namespace EgtCAM5
          End Get
       End Property
 
+      Public ReadOnly Property SubTypeMsg As String
+         Get
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 103)
+         End Get
+      End Property
+
       Public ReadOnly Property StepParMsg As String
          Get
             Return EgtMsg(MSG_MACHININGSDBPAGE + 77)
          End Get
       End Property
 
+      Public ReadOnly Property SideStepMsg As String
+         Get
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 95)
+         End Get
+      End Property
+
       Public ReadOnly Property StartSlowLenMsg As String
          Get
             Return EgtMsg(MSG_MACHININGSDBPAGE + 74)
@@ -2152,6 +2212,7 @@ Namespace EgtCAM5
 #End Region    ' Messages
 
       Private Sub ReadMachiningParam()
+         Dim nValue As Integer = 0
          Dim dValue As Double = 0
          EgtGetMachiningParam(MCH_MP.TYPE, m_Type)
          NotifyPropertyChanged("Type")
@@ -2161,10 +2222,20 @@ Namespace EgtCAM5
          EgtGetMachiningParam(MCH_MP.LEAVETAB, m_LeaveTab)
          NotifyPropertyChanged("LeaveTab")
          m_IsModifiedLeaveTab = False
-         EgtGetMachiningParam(MCH_MP.WORKSIDE, m_SelectedWorkSide)
+         EgtGetMachiningParam(MCH_MP.WORKSIDE, nValue)
+         If Not IsNothing(WorkSideList) Then
+            m_SelectedWorkSide = IdNameStruct.SearchToId(nValue, WorkSideList)
+         Else
+            m_SelectedWorkSide = nValue
+         End If
          NotifyPropertyChanged("SelectedWorkSide")
          m_IsModifiedSelectedWorkSide = False
-         EgtGetMachiningParam(MCH_MP.HEADSIDE, m_SelectedHeadSide)
+         EgtGetMachiningParam(MCH_MP.HEADSIDE, nValue)
+         If Not IsNothing(HeadSideList) Then
+            m_SelectedHeadSide = IdNameStruct.SearchToId(nValue, HeadSideList)
+         Else
+            m_SelectedHeadSide = nValue
+         End If
          NotifyPropertyChanged("SelectedHeadSide")
          m_IsModifiedSelectedHeadSide = False
          NotifyPropertyChanged("LeadInTypeList")
@@ -2346,6 +2417,7 @@ Namespace EgtCAM5
       End Sub
 
       Private Sub WriteMachiningParam()
+         Dim nValue As Integer = 0
          Dim dValue As Double = 0
          If m_IsModifiedInvert Then
             If EgtSetMachiningParam(MCH_MP.INVERT, m_Invert) Then
@@ -2358,12 +2430,22 @@ Namespace EgtCAM5
             End If
          End If
          If m_IsModifiedSelectedWorkSide Then
-            If EgtSetMachiningParam(MCH_MP.WORKSIDE, m_SelectedWorkSide) Then
+            If Not IsNothing(WorkSideList) Then
+               nValue = IdNameStruct.SearchFromId(m_SelectedWorkSide, WorkSideList)
+            Else
+               nValue = m_SelectedWorkSide
+            End If
+            If EgtSetMachiningParam(MCH_MP.WORKSIDE, nValue) Then
                m_IsModifiedSelectedWorkSide = False
             End If
          End If
          If m_IsModifiedSelectedHeadSide Then
-            If EgtSetMachiningParam(MCH_MP.HEADSIDE, m_SelectedHeadSide) Then
+            If Not IsNothing(HeadSideList) Then
+               nValue = IdNameStruct.SearchFromId(m_SelectedHeadSide, HeadSideList)
+            Else
+               nValue = m_SelectedHeadSide
+            End If
+            If EgtSetMachiningParam(MCH_MP.HEADSIDE, nValue) Then
                m_IsModifiedSelectedHeadSide = False
             End If
          End If
@@ -2625,29 +2707,6 @@ Namespace EgtCAM5
          m_UpdateParamValues = AddressOf ReadMachiningParam
       End Sub
 
-      Private Function ConvertTypeToImage(Type As Integer) As String
-         Select Case Type
-            Case MCH_OY.DISP
-               Return ""
-            Case MCH_OY.DRILLING
-               Return ""
-            Case MCH_OY.SAWING
-               Return ""
-            Case MCH_OY.MILLING
-               Return ""
-            Case MCH_OY.POCKETING
-               Return ""
-            Case MCH_OY.MORTISING
-               Return ""
-            Case MCH_OY.SAWROUGHING
-               Return ""
-            Case MCH_OY.SAWFINISHING
-               Return ""
-            Case Else
-               Return String.Empty
-         End Select
-      End Function
-
 #Region "UpdateMachiningCommand"
 
       ''' <summary>
@@ -2766,6 +2825,8 @@ Public Class OperationParamVisibilityConverter
             Return SharedFieldsClass.Sawfinishing(CInt(parameter))
          Case MCH_OY.GENMACHINING
             Return SharedFieldsClass.GenMachining(CInt(parameter))
+         Case MCH_OY.CHISELING
+            Return SharedFieldsClass.Chiseling(CInt(parameter))
          Case Else
             Return Visibility.Hidden
       End Select
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb
index c7d5948..6a5b22a 100644
--- a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb
@@ -148,6 +148,10 @@ Namespace EgtCAM5
                            Application.Msn.NotifyColleagues(Application.SETSCENESELMODE, OptionModule.m_SelGeomSawRoughing)
                         Case MCH_OY.SAWFINISHING
                            Application.Msn.NotifyColleagues(Application.SETSCENESELMODE, OptionModule.m_SelGeomSawFinishing)
+                        Case MCH_OY.GENMACHINING
+                           Application.Msn.NotifyColleagues(Application.SETSCENESELMODE, OptionModule.m_SelGeomGenMachining)
+                        Case MCH_OY.CHISELING
+                           Application.Msn.NotifyColleagues(Application.SETSCENESELMODE, OptionModule.m_SelGeomChiseling)
                      End Select
                   End If
                Else
@@ -770,20 +774,18 @@ Namespace EgtCAM5
          While Id <> GDB_ID.NULL
             EgtGetOperationName(Id, OpName)
             OpType = EgtGetOperationType(Id)
-            Select Case OpType
-               Case MCH_OY.DRILLING, MCH_OY.SAWING, MCH_OY.MILLING, MCH_OY.POCKETING, MCH_OY.MORTISING,
-                    MCH_OY.SAWROUGHING, MCH_OY.SAWFINISHING, MCH_OY.GENMACHINING
+            If IsValidMachiningType(OpType) Then
                   EgtSetCurrMachining(Id)
                   OpStatus = EgtGetOperationMode(Id)
                   EgtGetMachiningParam(MCH_MP.TOOL, OpTool)
                   EgtGetMachiningParam(MCH_MP.NAME, OpMach)
                   OperationList.Add(New MachiningOpListBoxItem(Id, OpStatus, OpName, OpType, OpTool, OpMach))
-               Case MCH_OY.DISP
+            ElseIf IsValidDispositionType(OpType) Then
                   OpStatus = True
                   OpTool = String.Empty
                   OpMach = String.Empty
                   OperationList.Add(New DispositionOpListBoxItem(Id, OpName, OpType))
-            End Select
+            End If
             Id = EgtGetNextOperation(Id)
          End While
       End Sub
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/MachiningOpListBoxItem.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/MachiningOpListBoxItem.vb
index 853437e..288f48c 100644
--- a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/MachiningOpListBoxItem.vb
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBoxItem/MachiningOpListBoxItem.vb
@@ -89,6 +89,8 @@ Public Class MachiningOpListBoxItem
             Return ""
          Case MCH_OY.GENMACHINING
             Return ""
+         Case MCH_OY.CHISELING
+            Return ""
          Case Else
             Return String.Empty
       End Select