Added common analytic and route changes