Improve directory provider