Analytics Improvement