Added more analytic event tracking