Update for eshelf :book: