Updated position searcher. Add base class.