DFA/grammar based evaluation added, put results in DB