Add final states and event counting
Event counting