Added more features on analytics