Added support for Universal Analytics