Added analytics support