Analytics change to track all the activities