Converted restore_options to use CrAPI