Improved searching speed