Refactor on CompanyInvestments