More work on analytics logging