Add non_terminal serialization