Adding analytics support