Added search and file reading