diff --git a/Implab/Automaton/RegularExpressions/EndToken.cs b/Implab/Automaton/RegularExpressions/EndToken.cs
--- a/Implab/Automaton/RegularExpressions/EndToken.cs
+++ b/Implab/Automaton/RegularExpressions/EndToken.cs
@@ -14,7 +14,7 @@ namespace Implab.Automaton.RegularExpres
         }
 
         public EndToken()
-            : this(0) {
+            : this(default(TTag)) {
         }
 
         public TTag Tag {
diff --git a/Implab/Automaton/RegularExpressions/IDFATable2.cs b/Implab/Automaton/RegularExpressions/IDFATable2.cs
deleted file mode 100644
--- a/Implab/Automaton/RegularExpressions/IDFATable2.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System;
-
-namespace Implab.Automaton.RegularExpressions {
-    public interface IDFATable2<TTag> : IDFATable {
-        void MarkFinalState(int state, TTag[] tags);
-
-    }
-}
-
diff --git a/Implab/Automaton/RegularExpressions/RegularDFABuilder.cs b/Implab/Automaton/RegularExpressions/RegularDFABuilder.cs
--- a/Implab/Automaton/RegularExpressions/RegularDFABuilder.cs
+++ b/Implab/Automaton/RegularExpressions/RegularDFABuilder.cs
@@ -122,7 +122,7 @@ namespace Implab.Automaton.RegularExpres
             m_ends.Add(m_idx, token.Tag);
         }
 
-        public void BuildDFA(IDFATableBuilder<TTag> dfa) {
+        public void BuildDFA(IDFATableBuilder dfa) {
             Safe.ArgumentNotNull(dfa,"dfa");
 
             var states = new MapAlphabet<HashSet<int>>(new CustomEqualityComparer<HashSet<int>>(
@@ -165,7 +165,7 @@ namespace Implab.Automaton.RegularExpres
                             
                             queue.Enqueue(next);
                         }
-                        dfa.DefineTransition(s1, s2, a);
+                        dfa.Add(new AutomatonTransition(s1, s2, a));
                     }
                 }
             }
diff --git a/Implab/Automaton/RegularExpressions/RegularDFADefinition.cs b/Implab/Automaton/RegularExpressions/RegularDFADefinition.cs
--- a/Implab/Automaton/RegularExpressions/RegularDFADefinition.cs
+++ b/Implab/Automaton/RegularExpressions/RegularDFADefinition.cs
@@ -1,8 +1,11 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace Implab.Automaton.RegularExpressions {
     public class RegularDFADefinition<TInput, TTag> : DFATable {
 
+        readonly Dictionary<int,TTag[]> m_tags = new Dictionary<int, TTag[]>();
         readonly IAlphabet<TInput> m_alphabet;
 
         public RegularDFADefinition(IAlphabet<TInput> alphabet) {
@@ -25,16 +28,39 @@ namespace Implab.Automaton.RegularExpres
             return base.ConstructTransitionTable();
         }
 
+        public void MarkFinalState(int s, TTag[] tags) {
+            MarkFinalState(s);
+            SetStateTag(s, tags);
+        }
+
+        public void SetStateTag(int s, TTag[] tags) {
+            Safe.ArgumentNotNull(tags, "tags");
+            m_tags[s] = tags;
+        }
+
+        public TTag[] GetStateTag(int s) {
+            TTag[] tags;
+            return m_tags.TryGetValue(s, out tags) ? tags : new TTag[0];
+        }
+
         /// <summary>
         /// Optimize the specified alphabet.
         /// </summary>
-        /// <param name = "dfaTable"></param>
         /// <param name="alphabet">Пустой алфавит, который будет зполнен в процессе оптимизации.</param>
-        public void Optimize(IDFATableBuilder<TTag> dfaTable, IAlphabetBuilder<TInput> alphabet) {
+        public RegularDFADefinition<TInput,TTag> Optimize(IAlphabetBuilder<TInput> alphabet) {
             Safe.ArgumentNotNull(alphabet, "alphabet");
-            Safe.ArgumentNotNull(dfaTable, "dfaTable");
+
+            var dfaTable = new RegularDFADefinition<TInput, TTag>(alphabet);
+
+            var states = new DummyAlphabet(StateCount);
+            var map = new MapAlphabet<int>();
 
-            Optimize(dfaTable, InputAlphabet, alphabet, new DummyAlphabet(StateCount), new MapAlphabet<int>()); 
+            Optimize(dfaTable, InputAlphabet, alphabet, states, map); 
+
+            foreach (var g in m_tags.Where(x => x.Key < StateCount).GroupBy(x => map.Translate(x.Key), x => x.Value ))
+                dfaTable.SetStateTag(g.Key, g.SelectMany(x => x).ToArray());
+
+            return dfaTable;
         }
 
 
diff --git a/Implab/Implab.csproj b/Implab/Implab.csproj
--- a/Implab/Implab.csproj
+++ b/Implab/Implab.csproj
@@ -190,7 +190,6 @@
     <Compile Include="Automaton\IDFATable.cs" />
     <Compile Include="Automaton\IDFATableBuilder.cs" />
     <Compile Include="Automaton\DFATable.cs" />
-    <Compile Include="Automaton\RegularExpressions\IDFATable2.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup />