Upgrading from Portfolio 1.x to Portfolio 2.x