Issue #232

Code improvements
Several code updates to fix issues
Merge pull request #263 from FWAJL/dev

Dev to feature_service_providers