Updates to include analytics