Improve some thing on DataSharing