better analytics support