Removed separate state mgt, as it introduced redundant record updates.

Introduces TriggerWrapper to hold trigger and state.
TriggerWrapper