Added more analytics