Added custom search