Updated portfolio controller