Analytics improvements