Sarang | Added provider name field and code refactoring