PMD : refactor pim flexible entity extension