Added tracking for general and downloads