Issue #309

Old implementation was used. Replaced with PmHelper to list Service Providers