Adding tracking for analytics