Added tracking for other events too