added analytics support