WIP for generalized extra_option