Added PNames support