Chore/analytics

@alexey-rise please review. Thanks!