Move these options to vendor