adding analytics support