Changed PortfolioImpl