Updated schema for advanced search.