Improved user tracking.