Options for an Improved and Integrated System of Retirement