Implemented more portfolio functionality