Fixed #2 - Refactored PortfolioItem/Feature to detect the PI Type Name