Added better analytics