Optimize by adding current state to transactions