Updated analytics support.