Updated parsing of books