Using SearchLight as a library
Merged from current fork