Accounts will be split into flexible savings and retirement income savings.