Updated to use service.library.data.provider