Changes to provider definition (simplified) and DataProviderDSL