Add in analytics support