Added Users analytics support