Adding search and lex