Added support for sharing