Add more analytics