Start adding support for search operations