Added PMD, some housekeeping