Refactored | Track Analytics