Updated portfolio structure