Moving to the new Shelf interface