Add better tracking for multiple events