Add support of search