Issue/70 analytics