Updated Analytics generation system.