Improved integration with Shelf