Mods to the Portfolio class