Add Proper User Tracking