Factored out OptionsContainer