Improve EPUB Parser