Finalize support for restricted mode option.