WIP: Sharing items improvements