Change portfolio data object to not require loops to go through it