WIP: swtich to service.data.provider