Enhancement#7/providerdataservice

Fixes #7