Added support for better google analytics