Update for new analytics