PMD Improvements