Support both "wrapper" and "wrapper_class" options