Added extra_opts support