[IMP] Improving sharing functionality