Issue #309

Old implementation was used. Replaced with PmHelper to list Service Providers
Merge pull request #331 from FWAJL/dev

Issue #309