Adding support for saving options.