Added search funtions