Added support for fallback directories