Improved google analytics support