Add more advanced BookshelfWithBooks