Made Google Analytics more generic