Refactoring the portfolio item model factory