Update to restore equivalent functionality after the bookshelf update