Analytics Enhancements