Adding Investor Needs and Current Account Features