Sarang | Added provider name, search mode and code refactoring