Adding fallbacks for options