Updated Google Analytics handling