Added search and upload