Fix previous commit. Added some checks and implemented a Worker instead a Searcher