Changing the APIs to support return of metadata from search operations.