Work on the Pdf component refactor