Some more work on the provider-API