Better provider loading.