Add support for extra_options