add - macro for start state
fix - field processing