Added some preparation for search