Simplify analytics updating