Updated the analyzer event flow