Adding more support for sharing.