Ported Portfolio specific stuff from Application to Portfolio