Updated code to implement various changes in Service, Provider and vendor