Added support to Universal Analytics