refactor 0.2.1 Field_Row, Enumset_Row rewritten