Further work on ResourceProvider.