Adding proper tracking for GA.