Refactored look up for PMD library