Added Search functionalities