Changes for Analytics