No more static searchs