Add raw_options option