Adding more analytics