Add more properties to the PDF preclass logic