Refactored tracking policy to also track RUNNING (without duplicate events)