Added remaining analytics codes