Added address tracking for GA