Sharing tracking improvements