Add generated options as default values when available