Updated share management functions & procedure