Extend option to support for-share and for-update