Necessary changes in ShareVO