Work on Pdf component refactor