Add bookId and shelfId fields