Analytics update

Closes issue #1163.