Support new options for search