Add 'wrapper' and 'wrapper_class' config options