diff --git a/UD_any/tokeparser_incr/machine.rm b/UD_any/tokeparser_incr/machine.rm
index e4edaf3387f42ab1071d5bc74d2b0f9fc8fb6fcb..abe911d55831073733d5eee25a5c454cdf888af8 100644
--- a/UD_any/tokeparser_incr/machine.rm
+++ b/UD_any/tokeparser_incr/machine.rm
@@ -5,12 +5,12 @@ Classifier : tokemorpho
   Network type :            LSTM
   Unknown value threshold : -1
   Buffer context :          {-5 -4 -3 -2 -1}
-  Stack context :           {}
+  Stack context :           {3 2 1 0}
   Columns :                 {FORM UPOS}
   Focused buffer :          {-1 0}
-  Focused stack :           {}
-  Focused columns :         {ID FORM FEATS}
-  Max nb elements :         {1 10 10}
+  Focused stack :           {1 0}
+  Focused columns :         {ID EOS FORM FEATS}
+  Max nb elements :         {1 1 10 10}
   Raw input left window :   5
   Raw input right window :  5
   Embeddings size :         256
@@ -22,10 +22,10 @@ Classifier : tokemorpho
   Num layers :              3
   BiLSTM :                  true
   LSTM dropout :            0.3
-  Tree embedding columns :  {DEPREL}
+  Tree embedding columns :  {FORM POS DEPREL}
   Tree embedding buffer :   {-1}
-  Tree embedding stack :    {0}
-  Tree embedding nb :       {5 10}
+  Tree embedding stack :    {0 1}
+  Tree embedding nb :       {6 10}
   Tree embedding size :     128
 }
 Splitwords : data/splitwords.ts
diff --git a/UD_any/tokeparser_seq/machine.rm b/UD_any/tokeparser_seq/machine.rm
index eef1d6912e8b3b2d0384fe63f53d34a62370f1e0..e2b2ab0e984d313c20c2c0de9d2248b6364c9afb 100644
--- a/UD_any/tokeparser_seq/machine.rm
+++ b/UD_any/tokeparser_seq/machine.rm
@@ -5,12 +5,12 @@ Classifier : tokemorpho
   Network type :            LSTM
   Unknown value threshold : -1
   Buffer context :          {-5 -4 -3 -2 -1 1 2}
-  Stack context :           {}
+  Stack context :           {3 2 1 0}
   Columns :                 {FORM UPOS}
   Focused buffer :          {-1 0}
-  Focused stack :           {}
-  Focused columns :         {ID FORM FEATS}
-  Max nb elements :         {1 10 10}
+  Focused stack :           {1 0}
+  Focused columns :         {ID EOS FORM FEATS}
+  Max nb elements :         {1 1 10 10}
   Raw input left window :   5
   Raw input right window :  5
   Embeddings size :         256
@@ -22,10 +22,10 @@ Classifier : tokemorpho
   Num layers :              3
   BiLSTM :                  true
   LSTM dropout :            0.3
-  Tree embedding columns :  {DEPREL}
+  Tree embedding columns :  {FORM POS DEPREL}
   Tree embedding buffer :   {-1}
-  Tree embedding stack :    {0}
-  Tree embedding nb :       {5 10}
+  Tree embedding stack :    {0 1}
+  Tree embedding nb :       {6 10}
   Tree embedding size :     128
 }
 Splitwords : data/splitwords.ts