Rename 'with_wait' to '_with_options'