Updating code for search core