Dispatcher: Added search API integration and changed Files as suggested