[Analytics] Changed code