Optimize finder