Merge extra options and use the new variant API to enable/disable