moved _add_options to internal method