Changed how the provider gets loaded